summaryrefslogtreecommitdiff
path: root/src/activeqt
diff options
context:
space:
mode:
Diffstat (limited to 'src/activeqt')
-rw-r--r--src/activeqt/container/qaxbase.cpp430
-rw-r--r--src/activeqt/container/qaxbase.h12
-rw-r--r--src/activeqt/container/qaxobject.cpp25
-rw-r--r--src/activeqt/container/qaxobject.h9
-rw-r--r--src/activeqt/container/qaxwidget.cpp25
-rw-r--r--src/activeqt/container/qaxwidget.h6
6 files changed, 292 insertions, 215 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 0283ad1..cf03f6e 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -55,11 +55,16 @@
#include <qpair.h>
#include <qmetaobject.h>
#include <qsettings.h>
+#include <qdebug.h>
#ifndef QT_NO_THREAD
# include <qmutex.h>
#endif
+#include <private/qobject_p.h>
+#include <private/qmetaobject_p.h>
+#include <private/qmetaobjectbuilder_p.h>
+
#include <qt_windows.h>
#include <ocidl.h>
#include <ctype.h>
@@ -389,7 +394,7 @@ public:
QString nameString = QLatin1String(signame);
void *argv[] = {0, &nameString, &pDispParams->cArgs, &pDispParams->rgvarg};
- combase->qt_metacall(QMetaObject::InvokeMetaMethod, index, argv);
+ QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod, index, argv);
}
HRESULT hres = S_OK;
@@ -462,7 +467,7 @@ public:
if (ok) {
// emit the generated signal if everything went well
- combase->qt_metacall(QMetaObject::InvokeMetaMethod, index, argv);
+ QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod, index, argv);
// update the VARIANT for references and free memory
for (p = 0; p < pcount; ++p) {
bool out;
@@ -511,7 +516,7 @@ public:
if (index != -1) {
QString propnameString = QString::fromLatin1(propname);
void *argv[] = {0, &propnameString};
- combase->qt_metacall(QMetaObject::InvokeMetaMethod, index, argv);
+ QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod, index, argv);
}
QByteArray signame = propsigs.value(dispID);
@@ -537,7 +542,7 @@ public:
argv[1] = &var;
// emit the "changed" signal
- combase->qt_metacall(QMetaObject::InvokeMetaMethod, index, argv);
+ QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod, index, argv);
}
return S_OK;
}
@@ -1536,49 +1541,21 @@ private:
QByteArray usertypeToString(const TYPEDESC &tdesc, ITypeInfo *info, const QByteArray &function);
QByteArray guessTypes(const TYPEDESC &tdesc, ITypeInfo *info, const QByteArray &function);
- // ### from qmetaobject.cpp
+ // ActiveQt's extensions to the PropertyFlags defined in qmetaobject_p.h.
+ // This will break if new overlapping flags are added in qmetaobject_p.h!
enum ProperyFlags {
- Invalid = 0x00000000,
- Readable = 0x00000001,
- Writable = 0x00000002,
- Resettable = 0x00000004,
- EnumOrFlag = 0x00000008,
- StdCppSet = 0x00000100,
-// Override = 0x00000200,
- Designable = 0x00001000,
- ResolveDesignable = 0x00002000,
- Scriptable = 0x00004000,
- ResolveScriptable = 0x00008000,
- Stored = 0x00010000,
- ResolveStored = 0x00020000,
- Editable = 0x00040000,
- ResolveEditable = 0x00080000,
- User = 0x00100000,
- ResolveUser = 0x00200000,
- // And our own - don't use the upper byte, as it's used for the property type
- RequestingEdit = 0x00400000,
- Bindable = 0x00800000
- };
- enum MemberFlags {
- AccessPrivate = 0x00,
- AccessProtected = 0x01,
- AccessPublic = 0x02,
- MemberMethod = 0x00,
- MemberSignal = 0x04,
- MemberSlot = 0x08,
- MemberCompatibility = 0x10,
- MemberCloned = 0x20,
- MemberScriptable = 0x40,
+ RequestingEdit = 0x01000000,
+ Bindable = 0x02000000
};
- inline QList<QByteArray> paramList(const QByteArray &proto)
+ static inline QList<QByteArray> paramList(const QByteArray &proto)
{
QByteArray prototype(proto);
QByteArray parameters = prototype.mid(prototype.indexOf('(') + 1);
parameters.truncate(parameters.length() - 1);
-
- QList<QByteArray> plist = parameters.split(',');
- return plist;
+ if (parameters.isEmpty() || parameters == "void")
+ return QList<QByteArray>();
+ return parameters.split(',');
}
inline QByteArray replaceType(const QByteArray &type)
@@ -1641,9 +1618,9 @@ private:
QByteArray proto(replacePrototype(prototype));
Method &signal = signal_list[proto];
- signal.type = 0;
+ signal.type = "void";
signal.parameters = parameters;
- signal.flags = QMetaMethod::Public | MemberSignal;
+ signal.flags = QMetaMethod::Public | MethodSignal;
if (proto != prototype)
signal.realPrototype = prototype;
}
@@ -1661,9 +1638,10 @@ private:
QByteArray proto = replacePrototype(prototype);
Method &slot = slot_list[proto];
+
slot.type = replaceType(type);
slot.parameters = parameters;
- slot.flags = flags | MemberSlot;
+ slot.flags = flags | MethodSlot;
if (proto != prototype)
slot.realPrototype = prototype;
}
@@ -1675,11 +1653,13 @@ private:
return slot_list.contains(prototype);
}
+ static int aggregateParameterCount(const QMap<QByteArray, Method> &map);
+
struct Property {
- Property() : typeId(0)
+ Property() : flags(0)
{}
QByteArray type;
- uint typeId;
+ uint flags;
QByteArray realType;
};
QMap<QByteArray, Property> property_list;
@@ -1697,20 +1677,16 @@ private:
}
if (flags & Writable)
flags |= Stored;
- prop.typeId |= flags;
+ prop.flags = flags;
QVariant::Type vartype = QVariant::nameToType(prop.type);
switch(vartype) {
case QVariant::Invalid:
case QVariant::UserType:
- if (prop.type == "QVariant") {
- prop.typeId |= 0xff << 24;
- break;
- }
- if (QMetaType::type(prop.type) == -1)
- qWarning("QAxBase: Unsupported property type: %s", prop.type.data());
+ if (QMetaType::type(prop.type) == QMetaType::UnknownType)
+ qWarning("QAxBase: Unsupported property '%s' type: %s (%d)",
+ name.constData(), prop.type.data(), vartype);
break;
default:
- prop.typeId |= vartype << 24;
break;
}
}
@@ -1991,7 +1967,9 @@ QByteArray MetaObjectGenerator::guessTypes(const TYPEDESC &tdesc, ITypeInfo *inf
QByteArray str;
switch (tdesc.vt) {
case VT_EMPTY:
+ break;
case VT_VOID:
+ str = "void";
break;
case VT_LPWSTR:
str = "wchar_t *";
@@ -2380,17 +2358,24 @@ void MetaObjectGenerator::addChangedSignal(const QByteArray &function, const QBy
void MetaObjectGenerator::addSetterSlot(const QByteArray &property)
{
- QByteArray set;
QByteArray prototype(property);
if (isupper(prototype.at(0))) {
- set = "Set";
+ prototype.insert(0, "Set");
} else {
- set = "set";
prototype[0] = toupper(prototype[0]);
+ prototype.insert(0, "set");
+ }
+ const QByteArray type = propertyType(property);
+ if (type.isEmpty() || type == "void") {
+ qWarning("%s: Invalid property '%s' of type '%s' encountered.",
+ Q_FUNC_INFO, property.constData(), type.constData());
+ } else {
+ prototype += '(';
+ prototype += type;
+ prototype += ')';
+ if (!hasSlot(prototype))
+ addSlot("void", prototype, property);
}
- prototype = set + prototype + '(' + propertyType(property) + ')';
- if (!hasSlot(prototype))
- addSlot(0, prototype, property);
}
QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *typeinfo, const QList<QByteArray> &names,
@@ -2401,7 +2386,7 @@ QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *t
const QByteArray hresult("HRESULT");
// get function prototype
type = guessTypes(funcdesc->elemdescFunc.tdesc, typeinfo, function);
- if ((type.isEmpty() || type == hresult) &&
+ if ((type.isEmpty() || type == hresult || type == "void") &&
(funcdesc->invkind == INVOKE_PROPERTYPUT || funcdesc->invkind == INVOKE_PROPERTYPUTREF) &&
funcdesc->lprgelemdescParam) {
type = guessTypes(funcdesc->lprgelemdescParam->tdesc, typeinfo, function);
@@ -2541,7 +2526,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
flags |= Bindable;
}
// Don't generate code for properties without type
- if (type.isEmpty())
+ if (type.isEmpty() || type == "void")
break;
addProperty(type, function, flags);
@@ -3010,6 +2995,33 @@ QMetaObject *MetaObjectGenerator::tryCache()
return 0;
}
+static int nameToBuiltinType(const QByteArray &typeName)
+{
+ int id = QMetaType::type(typeName);
+ return (id < QMetaType::User) ? id : QMetaType::UnknownType;
+}
+
+static uint nameToTypeInfo(const QByteArray &typeName, QMetaStringTable &strings)
+{
+ int id = nameToBuiltinType(typeName);
+ if (id != QMetaType::UnknownType)
+ return id;
+ else
+ return IsUnresolvedType | strings.enter(typeName);
+}
+
+// Returns the sum of all parameters (including return type) for the given
+// \a map of methods. This is needed for calculating the size of the methods'
+// parameter type/name meta-data.
+int MetaObjectGenerator::aggregateParameterCount(const QMap<QByteArray, Method> &map)
+{
+ int sum = 0;
+ QMap<QByteArray, Method>::const_iterator it;
+ for (it = map.constBegin(); it != map.constEnd(); ++it)
+ sum += paramList(it.key()).size() + 1; // +1 for return type
+ return sum;
+}
+
QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, const QByteArray &className)
{
if (that) {
@@ -3036,122 +3048,109 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
QAxMetaObject *metaobj = new QAxMetaObject;
- // revision + classname + table + zero terminator
- uint int_data_size = 1+1+2+2+2+2+1;
+ int paramsDataSize =
+ ((aggregateParameterCount(signal_list)
+ + aggregateParameterCount(slot_list)) * 2) // types and parameter names
+ - signal_list.count() // return "parameters" don't have names
+ - slot_list.count(); // ditto
+ uint int_data_size = MetaObjectPrivateFieldCount;
int_data_size += classinfo_list.count() * 2;
- int_data_size += signal_list.count() * 5;
- int_data_size += slot_list.count() * 5;
+ int_data_size += (signal_list.count() + slot_list.count()) * 5 + paramsDataSize;
int_data_size += property_list.count() * 3;
int_data_size += enum_list.count() * 4;
for (QMap<QByteArray, QList<QPair<QByteArray, int> > >::ConstIterator it = enum_list.begin();
it != enum_list.end(); ++it) {
int_data_size += (*it).count() * 2;
}
+ ++int_data_size; // eod
uint *int_data = new uint[int_data_size];
- int_data[0] = 1; // revision number
- int_data[1] = 0; // classname index
- int_data[2] = classinfo_list.count(); // num_classinfo
- int_data[3] = 10; // idx_classinfo
- int_data[4] = signal_list.count() + slot_list.count(); // num_methods
- int_data[5] = int_data[3] + int_data[2] * 2; // idx_signals
- int_data[6] = property_list.count(); // num_properties
- int_data[7] = int_data[5] + int_data[4] * 5; // idx_properties
- int_data[8] = enum_list.count(); // num_enums
- int_data[9] = int_data[7] + int_data[6] * 3; // idx_enums
- int_data[int_data_size - 1] = 0; // eod;
-
- char null('\0');
- // data + zero-terminator
- QByteArray stringdata = that ? QByteArray(that->className()) : className;
- stringdata += null;
- stringdata.reserve(8192);
-
- uint offset = int_data[3]; //idx_classinfo
+ QMetaObjectPrivate *header = reinterpret_cast<QMetaObjectPrivate *>(int_data);
+ Q_STATIC_ASSERT_X(QMetaObjectPrivate::OutputRevision == 7, "QtDBus meta-object generator should generate the same version as moc");
+ header->revision = QMetaObjectPrivate::OutputRevision;
+ header->className = 0;
+ header->classInfoCount = classinfo_list.count();
+ header->classInfoData = MetaObjectPrivateFieldCount;
+ header->methodCount = signal_list.count() + slot_list.count();
+ header->methodData = header->classInfoData + header->classInfoCount * 2;
+ header->propertyCount = property_list.count();
+ header->propertyData = header->methodData + header->methodCount * 5 + paramsDataSize;
+ header->enumeratorCount = enum_list.count();
+ header->enumeratorData = header->propertyData + header->propertyCount * 3;
+ header->constructorCount = 0;
+ header->constructorData = 0;
+ header->flags = 0;
+ header->signalCount = signal_list.count();
+
+ QMetaStringTable strings;
+ strings.enter(that ? QByteArray(that->className()) : className);
+
+ uint offset = header->classInfoData;
// each class info in form key\0value\0
for (QMap<QByteArray, QByteArray>::ConstIterator it = classinfo_list.begin(); it != classinfo_list.end(); ++it) {
QByteArray key(it.key());
QByteArray value(it.value());
- int_data[offset++] = stringdata.length();
- stringdata += key;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += value;
- stringdata += null;
- }
- Q_ASSERT(offset == int_data[5]);
-
- // each signal in form prototype\0parameters\0type\0tag\0
- for (QMap<QByteArray, Method>::ConstIterator it = signal_list.begin(); it != signal_list.end(); ++it) {
- QByteArray prototype(QMetaObject::normalizedSignature(it.key()));
- QByteArray type(it.value().type);
- QByteArray parameters(it.value().parameters);
- if (!it.value().realPrototype.isEmpty())
- metaobj->realPrototype.insert(prototype, it.value().realPrototype);
- QByteArray tag;
- int flags = it.value().flags;
-
- int_data[offset++] = stringdata.length();
- stringdata += prototype;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += parameters;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += type;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += tag;
- stringdata += null;
- int_data[offset++] = flags;
+ int_data[offset++] = strings.enter(key);
+ int_data[offset++] = strings.enter(value);
}
-
- // each slot in form prototype\0parameters\0type\0tag\0
- for (QMap<QByteArray, Method>::ConstIterator it = slot_list.begin(); it != slot_list.end(); ++it) {
- QByteArray prototype(QMetaObject::normalizedSignature(it.key()));
- QByteArray type(it.value().type);
- QByteArray parameters(it.value().parameters);
- if (!it.value().realPrototype.isEmpty())
- metaobj->realPrototype.insert(prototype, it.value().realPrototype);
- QByteArray tag;
- int flags = it.value().flags;
-
- int_data[offset++] = stringdata.length();
- stringdata += prototype;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += parameters;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += type;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += tag;
- stringdata += null;
- int_data[offset++] = flags;
+ Q_ASSERT(offset == header->methodData);
+
+ uint paramsOffset = offset + header->methodCount * 5;
+ // add each method:
+ for (int x = 0; x < 2; ++x) {
+ // Signals must be added before other methods, to match moc.
+ const QMap<QByteArray, Method> &map = (x == 0) ? signal_list : slot_list;
+ for (QMap<QByteArray, Method>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it) {
+ QByteArray prototype(QMetaObject::normalizedSignature(it.key()));
+ QByteArray name = prototype.left(prototype.indexOf('('));
+ QList<QByteArray> paramTypeNames = paramList(prototype);
+ const QList<QByteArray> paramNames = it.value().parameters.isEmpty() ?
+ QList<QByteArray>() : it.value().parameters.split(',');
+ Q_ASSERT(paramTypeNames.size() == paramNames.size());
+ if (!it.value().realPrototype.isEmpty())
+ metaobj->realPrototype.insert(prototype, it.value().realPrototype);
+ int argc = paramTypeNames.size();
+ QByteArray tag;
+ int flags = it.value().flags;
+ int_data[offset++] = strings.enter(name);
+ int_data[offset++] = argc;
+ int_data[offset++] = paramsOffset;
+ int_data[offset++] = strings.enter(tag);
+ int_data[offset++] = flags;
+
+ // Parameter types
+ for (int i = -1; i < argc; ++i) {
+ QByteArray typeName = (i < 0) ? it.value().type : paramTypeNames.at(i);
+ Q_ASSERT(!typeName.isEmpty());
+ int_data[paramsOffset++] = nameToTypeInfo(typeName, strings);
+ }
+ // Parameter names
+ for (int i = 0; i < argc; ++i)
+ int_data[paramsOffset++] = strings.enter(paramNames.at(i));
+ }
}
- Q_ASSERT(offset == int_data[7]);
+ Q_ASSERT(offset == header->methodData + header->methodCount * 5);
+ Q_ASSERT(paramsOffset = header->propertyData);
+ offset += paramsDataSize;
+ Q_ASSERT(offset == header->propertyData);
// each property in form name\0type\0
for (QMap<QByteArray, Property>::ConstIterator it = property_list.begin(); it != property_list.end(); ++it) {
QByteArray name(it.key());
QByteArray type(it.value().type);
+ Q_ASSERT(!type.isEmpty());
QByteArray realType(it.value().realType);
if (!realType.isEmpty() && realType != type)
metaobj->realPrototype.insert(name, realType);
- uint flags = it.value().typeId;
-
- int_data[offset++] = stringdata.length();
- stringdata += name;
- stringdata += null;
- int_data[offset++] = stringdata.length();
- stringdata += type;
- stringdata += null;
+ uint flags = it.value().flags;
+
+ int_data[offset++] = strings.enter(name);
+ int_data[offset++] = nameToTypeInfo(type, strings);
int_data[offset++] = flags;
}
- Q_ASSERT(offset == int_data[9]);
+ Q_ASSERT(offset == header->enumeratorData);
int value_offset = offset + enum_list.count() * 4;
// each enum in form name\0
@@ -3160,32 +3159,28 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
int flags = 0x0; // 0x1 for flag?
int count = it.value().count();
- int_data[offset++] = stringdata.length();
- stringdata += name;
- stringdata += null;
+ int_data[offset++] = strings.enter(name);
int_data[offset++] = flags;
int_data[offset++] = count;
int_data[offset++] = value_offset;
value_offset += count * 2;
}
- Q_ASSERT(offset == int_data[9] + enum_list.count() * 4);
+ Q_ASSERT(offset == header->enumeratorData + enum_list.count() * 4);
// each enum value in form key\0
for (QMap<QByteArray, QList<QPair<QByteArray, int> > >::ConstIterator it = enum_list.begin(); it != enum_list.end(); ++it) {
for (QList<QPair<QByteArray,int> >::ConstIterator it2 = it.value().begin(); it2 != it.value().end(); ++it2) {
QByteArray key((*it2).first);
int value = (*it2).second;
- int_data[offset++] = stringdata.length();
- stringdata += key;
- stringdata += null;
+ int_data[offset++] = strings.enter(key);
int_data[offset++] = value;
}
}
Q_ASSERT(offset == int_data_size-1);
+ int_data[offset] = 0; // eod
- char *string_data = new char[stringdata.length()];
- memset(string_data, 0, sizeof(string_data));
- memcpy(string_data, stringdata, stringdata.length());
+ char *string_data = new char[strings.blobSize()];
+ strings.writeBlob(string_data);
// put the metaobject together
metaobj->d.data = int_data;
@@ -3215,42 +3210,62 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
return metaobj;
}
-static const uint qt_meta_data_QAxBase[] = {
+#define QT_MOC_LITERAL(idx, ofs, len) { \
+ Q_REFCOUNT_INITIALIZE_STATIC, len, 0, 0, \
+ offsetof(qt_meta_stringdata_QAxBase_t, stringdata) + ofs \
+ - idx * sizeof(QByteArrayData) \
+ }
+const QAxBase::qt_meta_stringdata_QAxBase_t QAxBase::qt_meta_stringdata_QAxBase = {
+ {
+QT_MOC_LITERAL(0, 0, 7),
+QT_MOC_LITERAL(1, 8, 6),
+QT_MOC_LITERAL(2, 15, 0),
+QT_MOC_LITERAL(3, 16, 4),
+QT_MOC_LITERAL(4, 21, 4),
+QT_MOC_LITERAL(5, 26, 4),
+QT_MOC_LITERAL(6, 31, 15),
+QT_MOC_LITERAL(7, 47, 9),
+QT_MOC_LITERAL(8, 57, 4),
+QT_MOC_LITERAL(9, 62, 6),
+QT_MOC_LITERAL(10, 69, 4),
+QT_MOC_LITERAL(11, 74, 4),
+QT_MOC_LITERAL(12, 79, 7)
+ },
+ "QAxBase\0signal\0\0name\0argc\0argv\0"
+ "propertyChanged\0exception\0code\0source\0"
+ "desc\0help\0control\0"
+};
+#undef QT_MOC_LITERAL
+
+const uint QAxBase::qt_meta_data_QAxBase[] = {
// content:
- 1, // revision
+ 7, // revision
0, // classname
0, 0, // classinfo
- 3, 10, // methods
- 1, 25, // properties
+ 3, 14, // methods
+ 1, 48, // properties
0, 0, // enums/sets
+ 0, 0, // constructors
+ 0, // flags
+ 3, // signalCount
- // signals: signature, parameters, type, tag, flags
- 24, 9, 8, 8, 0x05,
- 55, 50, 8, 8, 0x05,
- 102, 80, 8, 8, 0x05,
+ // signals: name, argc, parameters, tag, flags
+ 1, 3, 29, 2, 0x05,
+ 6, 1, 36, 2, 0x05,
+ 7, 4, 39, 2, 0x05,
+
+ // signals: parameters
+ QMetaType::Void, QMetaType::QString, QMetaType::Int, QMetaType::VoidStar, 3, 4, 5,
+ QMetaType::Void, QMetaType::QString, 3,
+ QMetaType::Void, QMetaType::Int, QMetaType::QString, QMetaType::QString, QMetaType::QString, 8, 9, 10, 11,
// properties: name, type, flags
- 149, 141, 0x0a095103,
+ 12, QMetaType::QString, 0x00095000,
0 // eod
};
-static const char qt_meta_stringdata_QAxBase[] = {
- "QAxBase\0\0name,argc,argv\0signal(QString,int,void*)\0name\0"
- "propertyChanged(QString)\0code,source,desc,help\0"
- "exception(int,QString,QString,QString)\0QString\0control\0"
-};
-
-static QMetaObject qaxobject_staticMetaObject = {
- { &QObject::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_QAxBase),
- qt_meta_data_QAxBase, 0 }
-};
-static QMetaObject qaxwidget_staticMetaObject = {
- { &QWidget::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_QAxBase),
- qt_meta_data_QAxBase, 0 }
-};
-
/*!
\internal
@@ -3275,11 +3290,9 @@ const QMetaObject *QAxBase::metaObject() const
#endif
// return the default meta object if not yet initialized
- if (!d->ptr || !d->useMetaObject) {
- if (qObject()->isWidgetType())
- return &qaxwidget_staticMetaObject;
- return &qaxobject_staticMetaObject;
- }
+ if (!d->ptr || !d->useMetaObject)
+ return fallbackMetaObject();
+
MetaObjectGenerator generator((QAxBase*)this, d);
return generator.metaObject(parentObject);
}
@@ -3436,7 +3449,7 @@ static bool checkHRESULT(HRESULT hres, EXCEPINFO *exc, QAxBase *that, const QStr
if (QAxEventSink::signalHasReceivers(that->qObject(), "exception(int,QString,QString,QString)")) {
void *argv[] = {0, &code, &source, &desc, &help};
- that->qt_metacall(QMetaObject::InvokeMetaMethod, exceptionSignal, argv);
+ QAxBase::qt_static_metacall(that, QMetaObject::InvokeMetaMethod, exceptionSignal, argv);
printWarning = false;
}
}
@@ -3709,6 +3722,28 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v)
/*!
\internal
*/
+int QAxBase::qt_static_metacall(QAxBase *_t, QMetaObject::Call _c, int _id, void **_a)
+{
+ Q_ASSERT(_t != 0);
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ const QMetaObject *mo = _t->metaObject();
+ switch (mo->method(_id + mo->methodOffset()).methodType()) {
+ case QMetaMethod::Signal:
+ QMetaObject::activate(_t->qObject(), mo, _id, _a);
+ return _id - mo->methodCount();
+ case QMetaMethod::Method:
+ case QMetaMethod::Slot:
+ return _t->internalInvoke(_c, _id, _a);
+ default:
+ break;
+ }
+ }
+ return 0;
+}
+
+/*!
+ \internal
+*/
int QAxBase::qt_metacall(QMetaObject::Call call, int id, void **v)
{
const QMetaObject *mo = metaObject();
@@ -3719,18 +3754,7 @@ int QAxBase::qt_metacall(QMetaObject::Call call, int id, void **v)
switch(call) {
case QMetaObject::InvokeMetaMethod:
- switch (mo->method(id + mo->methodOffset()).methodType()) {
- case QMetaMethod::Signal:
- QMetaObject::activate(qObject(), mo, id, v);
- id -= mo->methodCount();
- break;
- case QMetaMethod::Method:
- case QMetaMethod::Slot:
- id = internalInvoke(call, id, v);
- break;
- default:
- break;
- }
+ id = qt_static_metacall(this, call, id, v);
break;
case QMetaObject::ReadProperty:
case QMetaObject::WriteProperty:
@@ -4437,7 +4461,7 @@ QVariant QAxBase::asVariant() const
cn = cn.mid(cn.lastIndexOf(':') + 1) + '*';
QObject *object = qObject();
int typeId = QMetaType::type(cn);
- if (!typeId)
+ if (typeId == QMetaType::UnknownType)
typeId = qRegisterMetaType<QObject *>(cn);
qvar = QVariant(typeId, &object);
}
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h
index cb8a7f1..b665c25 100644
--- a/src/activeqt/container/qaxbase.h
+++ b/src/activeqt/container/qaxbase.h
@@ -98,6 +98,7 @@ public:
virtual const QMetaObject *metaObject() const;
virtual int qt_metacall(QMetaObject::Call, int, void **);
+ static int qt_static_metacall(QAxBase *, QMetaObject::Call, int, void **);
virtual QObject *qObject() const = 0;
virtual const char *className() const = 0;
@@ -143,6 +144,15 @@ protected:
void connectNotify();
long indexOfVerb(const QString &verb) const;
+ virtual const QMetaObject *fallbackMetaObject() const = 0;
+
+ struct qt_meta_stringdata_QAxBase_t {
+ QByteArrayData data[13];
+ char stringdata[88];
+ };
+ static const qt_meta_stringdata_QAxBase_t qt_meta_stringdata_QAxBase;
+ static const uint qt_meta_data_QAxBase[];
+
private:
friend class QAxEventSink;
friend void *qax_createObjectWrapper(int, IUnknown*);
@@ -154,8 +164,6 @@ private:
int internalProperty(QMetaObject::Call, int index, void **v);
int internalInvoke(QMetaObject::Call, int index, void **v);
bool dynamicCallHelper(const char *name, void *out, QList<QVariant> &var, QByteArray &type);
-
- static QMetaObject staticMetaObject;
};
#if defined Q_CC_MSVC && _MSC_VER < 1300
diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp
index e4a11b4..9f26f63 100644
--- a/src/activeqt/container/qaxobject.cpp
+++ b/src/activeqt/container/qaxobject.cpp
@@ -82,6 +82,15 @@ QT_BEGIN_NAMESPACE
\sa QAxBase, QAxWidget, QAxScript, {ActiveQt Framework}
*/
+const QMetaObjectExtraData QAxObject::staticMetaObjectExtraData = {
+ 0, qt_static_metacall
+};
+
+const QMetaObject QAxObject::staticMetaObject = {
+ { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase.data,
+ qt_meta_data_QAxBase, &staticMetaObjectExtraData }
+};
+
/*!
Creates an empty COM object and propagates \a parent to the
QObject constructor. To initialize the object, call \link
@@ -125,6 +134,22 @@ QAxObject::~QAxObject()
/*!
\internal
*/
+void QAxObject::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+ QAxBase::qt_static_metacall(qobject_cast<QAxObject*>(_o), _c, _id, _a);
+}
+
+/*!
+ \internal
+*/
+const QMetaObject *QAxObject::fallbackMetaObject() const
+{
+ return &staticMetaObject;
+}
+
+/*!
+ \internal
+*/
const QMetaObject *QAxObject::metaObject() const
{
return QAxBase::metaObject();
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h
index a18c479..d6a1b97 100644
--- a/src/activeqt/container/qaxobject.h
+++ b/src/activeqt/container/qaxobject.h
@@ -54,13 +54,11 @@ QT_MODULE(ActiveQt)
class QAxObject : public QObject, public QAxBase
{
friend class QAxEventSink;
+ Q_OBJECT_FAKE
public:
- const QMetaObject *metaObject() const;
- void* qt_metacast(const char*);
- int qt_metacall(QMetaObject::Call, int, void **);
QObject* qObject() const { return (QObject*)this; }
const char *className() const;
-
+
QAxObject(QObject *parent = 0);
QAxObject(const QString &c, QObject *parent = 0);
QAxObject(IUnknown *iface, QObject *parent = 0);
@@ -70,11 +68,10 @@ public:
protected:
void connectNotify(const char *signal);
+ const QMetaObject *fallbackMetaObject() const;
private:
const QMetaObject *parentMetaObject() const;
-public:
- static QMetaObject staticMetaObject;
};
#if defined Q_CC_MSVC && _MSC_VER < 1300
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 0be6fed..5f708b6 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1921,6 +1921,15 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
\sa QAxBase, QAxObject, QAxScript, {ActiveQt Framework}
*/
+const QMetaObjectExtraData QAxWidget::staticMetaObjectExtraData = {
+ 0, qt_static_metacall
+};
+
+const QMetaObject QAxWidget::staticMetaObject = {
+ { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase.data,
+ qt_meta_data_QAxBase, &staticMetaObjectExtraData }
+};
+
/*!
Creates an empty QAxWidget widget and propagates \a parent
and \a f to the QWidget constructor. To initialize a control,
@@ -2114,6 +2123,22 @@ bool QAxWidget::doVerb(const QString &verb)
/*!
\internal
*/
+void QAxWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+ QAxBase::qt_static_metacall(qobject_cast<QAxWidget*>(_o), _c, _id, _a);
+}
+
+/*!
+ \internal
+*/
+const QMetaObject *QAxWidget::fallbackMetaObject() const
+{
+ return &staticMetaObject;
+}
+
+/*!
+ \internal
+*/
const QMetaObject *QAxWidget::metaObject() const
{
return QAxBase::metaObject();
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index 677fb81..2e9f0a8 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -59,10 +59,8 @@ class QAxClientSite;
class QAxWidget : public QWidget, public QAxBase
{
+ Q_OBJECT_FAKE
public:
- const QMetaObject *metaObject() const;
- void* qt_metacast(const char*);
- int qt_metacall(QMetaObject::Call, int, void **);
QObject* qObject() const { return (QWidget*)this; }
const char *className() const;
@@ -90,12 +88,12 @@ protected:
virtual bool translateKeyEvent(int message, int keycode) const;
void connectNotify(const char *signal);
+ const QMetaObject *fallbackMetaObject() const;
private:
friend class QAxClientSite;
QAxClientSite *container;
const QMetaObject *parentMetaObject() const;
- static QMetaObject staticMetaObject;
};
#if defined Q_CC_MSVC && _MSC_VER < 1300
View Lorry Controller Status