b2f9839457
For instance, exporting an object with a slot like QString complexMethod(const MyVariantMap& vars); (even with a simple typedef QVariantMap MyVariantMap) used to silently skip that method in the introspection. Now it outputs: generateInterfaceXml: Skipped method "complexMethod" : Invalid type in parameter list: MyVariantMap Change-Id: I7964cfb63e973257ce1abe47b9625e361b2ad23f Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
202 lines
7.4 KiB
C++
202 lines
7.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the QtDBus module of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3.0 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU General Public License version 3.0 requirements will be
|
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <string.h>
|
|
|
|
#ifndef QT_BOOTSTRAPPED
|
|
#include <QtCore/qcoreapplication.h>
|
|
#include <QtCore/qvariant.h>
|
|
#include <QtCore/qmetaobject.h>
|
|
|
|
#include "qdbusutil_p.h"
|
|
#include "qdbusconnection_p.h"
|
|
#include "qdbusabstractadaptor_p.h" // for QCLASSINFO_DBUS_*
|
|
#endif
|
|
#include <QtCore/qvector.h>
|
|
#include "qdbusmetatype_p.h"
|
|
|
|
#ifndef QT_NO_DBUS
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
bool qDBusCheckAsyncTag(const char *tag)
|
|
{
|
|
static const char noReplyTag[] = "Q_NOREPLY";
|
|
if (!tag || !*tag)
|
|
return false;
|
|
|
|
const char *p = strstr(tag, noReplyTag);
|
|
if (p != NULL &&
|
|
(p == tag || *(p-1) == ' ') &&
|
|
(p[sizeof noReplyTag - 1] == '\0' || p[sizeof noReplyTag - 1] == ' '))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
#ifndef QT_BOOTSTRAPPED
|
|
|
|
QString qDBusInterfaceFromMetaObject(const QMetaObject *mo)
|
|
{
|
|
QString interface;
|
|
|
|
int idx = mo->indexOfClassInfo(QCLASSINFO_DBUS_INTERFACE);
|
|
if (idx >= mo->classInfoOffset()) {
|
|
interface = QLatin1String(mo->classInfo(idx).value());
|
|
} else {
|
|
interface = QLatin1String(mo->className());
|
|
interface.replace(QLatin1String("::"), QLatin1String("."));
|
|
|
|
if (interface.startsWith(QLatin1String("QDBus"))) {
|
|
interface.prepend(QLatin1String("org.qtproject.QtDBus."));
|
|
} else if (interface.startsWith(QLatin1Char('Q')) &&
|
|
interface.length() >= 2 && interface.at(1).isUpper()) {
|
|
// assume it's Qt
|
|
interface.prepend(QLatin1String("org.qtproject.Qt."));
|
|
} else if (!QCoreApplication::instance()||
|
|
QCoreApplication::instance()->applicationName().isEmpty()) {
|
|
interface.prepend(QLatin1String("local."));
|
|
} else {
|
|
interface.prepend(QLatin1Char('.')).prepend(QCoreApplication::instance()->applicationName());
|
|
QStringList domainName =
|
|
QCoreApplication::instance()->organizationDomain().split(QLatin1Char('.'),
|
|
QString::SkipEmptyParts);
|
|
if (domainName.isEmpty())
|
|
interface.prepend(QLatin1String("local."));
|
|
else
|
|
for (int i = 0; i < domainName.count(); ++i)
|
|
interface.prepend(QLatin1Char('.')).prepend(domainName.at(i));
|
|
}
|
|
}
|
|
|
|
return interface;
|
|
}
|
|
|
|
bool qDBusInterfaceInObject(QObject *obj, const QString &interface_name)
|
|
{
|
|
const QMetaObject *mo = obj->metaObject();
|
|
for ( ; mo != &QObject::staticMetaObject; mo = mo->superClass())
|
|
if (interface_name == qDBusInterfaceFromMetaObject(mo))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// calculates the metatypes for the method
|
|
// the slot must have the parameters in the following form:
|
|
// - zero or more value or const-ref parameters of any kind
|
|
// - zero or one const ref of QDBusMessage
|
|
// - zero or more non-const ref parameters
|
|
// No parameter may be a template.
|
|
// this function returns -1 if the parameters don't match the above form
|
|
// this function returns the number of *input* parameters, including the QDBusMessage one if any
|
|
// this function does not check the return type, so metaTypes[0] is always 0 and always present
|
|
// metaTypes.count() >= retval + 1 in all cases
|
|
//
|
|
// sig must be the normalised signature for the method
|
|
int qDBusParametersForMethod(const QMetaMethod &mm, QVector<int> &metaTypes, QString &errorMsg)
|
|
{
|
|
return qDBusParametersForMethod(mm.parameterTypes(), metaTypes, errorMsg);
|
|
}
|
|
|
|
#endif // QT_BOOTSTRAPPED
|
|
|
|
int qDBusParametersForMethod(const QList<QByteArray> ¶meterTypes, QVector<int>& metaTypes, QString &errorMsg)
|
|
{
|
|
QDBusMetaTypeId::init();
|
|
metaTypes.clear();
|
|
|
|
metaTypes.append(0); // return type
|
|
int inputCount = 0;
|
|
bool seenMessage = false;
|
|
QList<QByteArray>::ConstIterator it = parameterTypes.constBegin();
|
|
QList<QByteArray>::ConstIterator end = parameterTypes.constEnd();
|
|
for ( ; it != end; ++it) {
|
|
const QByteArray &type = *it;
|
|
if (type.endsWith('*')) {
|
|
errorMsg = QLatin1String("Pointers are not supported: ") + QLatin1String(type);
|
|
return -1;
|
|
}
|
|
|
|
if (type.endsWith('&')) {
|
|
QByteArray basictype = type;
|
|
basictype.truncate(type.length() - 1);
|
|
|
|
int id = QMetaType::type(basictype);
|
|
if (id == 0) {
|
|
errorMsg = QLatin1String("Unregistered output type in parameter list: ") + QLatin1String(type);
|
|
return -1;
|
|
} else if (QDBusMetaType::typeToSignature(id) == 0)
|
|
return -1;
|
|
|
|
metaTypes.append( id );
|
|
seenMessage = true; // it cannot appear anymore anyways
|
|
continue;
|
|
}
|
|
|
|
if (seenMessage) { // && !type.endsWith('&')
|
|
errorMsg = QLatin1String("Invalid method, non-output parameters after message or after output parameters: ") + QLatin1String(type);
|
|
return -1; // not allowed
|
|
}
|
|
|
|
int id = QMetaType::type(type);
|
|
if (id == QMetaType::UnknownType) {
|
|
errorMsg = QLatin1String("Unregistered input type in parameter list: ") + QLatin1String(type);
|
|
return -1;
|
|
}
|
|
|
|
if (id == QDBusMetaTypeId::message())
|
|
seenMessage = true;
|
|
else if (QDBusMetaType::typeToSignature(id) == 0) {
|
|
errorMsg = QLatin1String("Type not registered with QtDBus in parameter list: ") + QLatin1String(type);
|
|
return -1;
|
|
}
|
|
|
|
metaTypes.append(id);
|
|
++inputCount;
|
|
}
|
|
|
|
return inputCount;
|
|
}
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // QT_NO_DBUS
|