diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-29 11:14:12 -0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 00:08:13 +0200 |
commit | f18a6c5fb569ab93e86ca4b75301a7495ba17768 (patch) | |
tree | 3664fbc1c95dc4afa194198d745b1558c133250a /src/tools/qdbuscpp2xml | |
parent | e12c34b244cbd15011c264b594cfee45b8e052f4 (diff) |
Update com.trolltech -> org.qtproject in the bootstrapped tools
The tools will now generate the new org.qtproject annotations only,
matching the XML generator in the library. They accept both types of
annotations as input though -- and will generate a warning about the
older one.
This commit should be backported to Qt 4, so XML files can start to be
ported.
Task-number: QTBUG-23274
Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'src/tools/qdbuscpp2xml')
-rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 66a59b56ec..60fd7302e0 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -129,7 +129,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) { // do we need to describe this argument? if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid) - xml += QString::fromLatin1(" <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n") + xml += QString::fromLatin1(" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n") .arg(typeNameToXml(mm.normalizedType.constData())); } else { return QString(); @@ -171,7 +171,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) { // do we need to describe this argument? if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { const char *typeName = QMetaType::typeName(types.at(j)); - xml += QString::fromLatin1(" <annotation name=\"com.trolltech.QtDBus.QtTypeName.%1%2\" value=\"%3\"/>\n") + xml += QString::fromLatin1(" <annotation name=\"org.qtproject.QtDBus.QtTypeName.%1%2\" value=\"%3\"/>\n") .arg(isOutput ? QLatin1String("Out") : QLatin1String("In")) .arg(isOutput && !isSignal ? j - inputCount : j - 1) .arg(typeNameToXml(typeName)); @@ -233,7 +233,7 @@ static QString generateInterfaceXml(const ClassDef *mo) .arg(QLatin1String(accessvalues[access])); if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { - retval += QString::fromLatin1(">\n <annotation name=\"com.trolltech.QtDBus.QtTypeName\" value=\"%3\"/>\n </property>\n") + retval += QString::fromLatin1(">\n <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n </property>\n") .arg(typeNameToXml(mp.type.constData())); } else { retval += QLatin1String("/>\n"); @@ -277,11 +277,11 @@ QString qDBusInterfaceFromClassDef(const ClassDef *mo) interface.replace(QLatin1String("::"), QLatin1String(".")); if (interface.startsWith(QLatin1String("QDBus"))) { - interface.prepend(QLatin1String("com.trolltech.QtDBus.")); + 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("local.com.trolltech.Qt.")); + interface.prepend(QLatin1String("local.org.qtproject.Qt.")); } else { interface.prepend(QLatin1String("local.")); } |