qt-svc-gen.py: Use lowerCamelCase for adaptee properties names/methods/signals.

5 files changed, 59 insertions, 39 deletions

diff --git a/TelepathyQt/base-connection-manager-internal.h b/TelepathyQt/base-connection-manager-internal.h
index 3511e12c..538accd9 100644
--- a/TelepathyQt/base-connection-manager-internal.h
+++ b/TelepathyQt/base-connection-manager-internal.h
@@ -37,8 +37,8 @@ namespace Tp
 class TP_QT_NO_EXPORT BaseConnectionManager::Adaptee : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList Interfaces READ interfaces)
-    Q_PROPERTY(Tp::ProtocolPropertiesMap Protocols READ protocols)
+    Q_PROPERTY(QStringList interfaces READ interfaces)
+    Q_PROPERTY(Tp::ProtocolPropertiesMap protocols READ protocols)
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseConnectionManager *cm);
diff --git a/TelepathyQt/base-protocol-internal.h b/TelepathyQt/base-protocol-internal.h
index 49978ccc..b79e97db 100644
--- a/TelepathyQt/base-protocol-internal.h
+++ b/TelepathyQt/base-protocol-internal.h
@@ -37,14 +37,14 @@ namespace Tp
 class TP_QT_NO_EXPORT BaseProtocol::Adaptee : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList Interfaces READ interfaces)
-    Q_PROPERTY(Tp::ParamSpecList Parameters READ parameters)
-    Q_PROPERTY(QStringList ConnectionInterfaces READ connectionInterfaces)
-    Q_PROPERTY(Tp::RequestableChannelClassList RequestableChannelClasses READ requestableChannelClasses)
-    Q_PROPERTY(QString VCardField READ vcardField)
-    Q_PROPERTY(QString EnglishName READ englishName)
-    Q_PROPERTY(QString Icon READ iconName)
-    Q_PROPERTY(QStringList AuthenticationTypes READ authenticationTypes)
+    Q_PROPERTY(QStringList interfaces READ interfaces)
+    Q_PROPERTY(Tp::ParamSpecList parameters READ parameters)
+    Q_PROPERTY(QStringList connectionInterfaces READ connectionInterfaces)
+    Q_PROPERTY(Tp::RequestableChannelClassList requestableChannelClasses READ requestableChannelClasses)
+    Q_PROPERTY(QString vCardField READ vCardField)
+    Q_PROPERTY(QString englishName READ englishName)
+    Q_PROPERTY(QString icon READ icon)
+    Q_PROPERTY(QStringList authenticationTypes READ authenticationTypes)
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseProtocol *protocol);
@@ -54,9 +54,9 @@ public:
     QStringList connectionInterfaces() const;
     ParamSpecList parameters() const;
     RequestableChannelClassList requestableChannelClasses() const;
-    QString vcardField() const;
+    QString vCardField() const;
     QString englishName() const;
-    QString iconName() const;
+    QString icon() const;
     QStringList authenticationTypes() const;
 
 private Q_SLOTS:
diff --git a/TelepathyQt/base-protocol.cpp b/TelepathyQt/base-protocol.cpp
index 644529f6..8782bc57 100644
--- a/TelepathyQt/base-protocol.cpp
+++ b/TelepathyQt/base-protocol.cpp
@@ -57,7 +57,7 @@ struct TP_QT_NO_EXPORT BaseProtocol::Private
     QStringList connInterfaces;
     ProtocolParameterList parameters;
     RequestableChannelClassSpecList rccSpecs;
-    QString vcardField;
+    QString vCardField;
     QString englishName;
     QString iconName;
     QStringList authTypes;
@@ -117,9 +117,9 @@ RequestableChannelClassList BaseProtocol::Adaptee::requestableChannelClasses() c
     return mProtocol->requestableChannelClasses().bareClasses();
 }
 
-QString BaseProtocol::Adaptee::vcardField() const
+QString BaseProtocol::Adaptee::vCardField() const
 {
-    return mProtocol->vcardField();
+    return mProtocol->vCardField();
 }
 
 QString BaseProtocol::Adaptee::englishName() const
@@ -127,7 +127,7 @@ QString BaseProtocol::Adaptee::englishName() const
     return mProtocol->englishName();
 }
 
-QString BaseProtocol::Adaptee::iconName() const
+QString BaseProtocol::Adaptee::icon() const
 {
     return mProtocol->iconName();
 }
@@ -209,14 +209,14 @@ void BaseProtocol::setRequestableChannelClasses(const RequestableChannelClassSpe
     mPriv->rccSpecs = rccSpecs;
 }
 
-QString BaseProtocol::vcardField() const
+QString BaseProtocol::vCardField() const
 {
-    return mPriv->vcardField;
+    return mPriv->vCardField;
 }
 
-void BaseProtocol::setVCardField(const QString &vcardField)
+void BaseProtocol::setVCardField(const QString &vCardField)
 {
-    mPriv->vcardField = vcardField;
+    mPriv->vCardField = vCardField;
 }
 
 QString BaseProtocol::englishName() const
diff --git a/TelepathyQt/base-protocol.h b/TelepathyQt/base-protocol.h
index 08d6a0aa..10572c6b 100644
--- a/TelepathyQt/base-protocol.h
+++ b/TelepathyQt/base-protocol.h
@@ -77,8 +77,8 @@ public:
     RequestableChannelClassSpecList requestableChannelClasses() const;
     void setRequestableChannelClasses(const RequestableChannelClassSpecList &rccSpecs);
 
-    QString vcardField() const;
-    void setVCardField(const QString &vcardField);
+    QString vCardField() const;
+    void setVCardField(const QString &vCardField);
 
     QString englishName() const;
     void setEnglishName(const QString &englishName);
diff --git a/tools/qt-svc-gen.py b/tools/qt-svc-gen.py
index b55c2fe2..e0c635a3 100644
--- a/tools/qt-svc-gen.py
+++ b/tools/qt-svc-gen.py
@@ -27,6 +27,25 @@ from libqtcodegen import binding_from_usage, extract_arg_or_member_info, format_
 
 # TODO generate docstrings
 
+def to_lower_camel_case(s):
+    if len(s) <= 1:
+        return s.lower()
+
+    i = 0
+    for c in s:
+        if not c.isupper():
+            break
+        i += 1
+
+    ret = s
+    if i == 1:
+        ret = s[0:i].lower() + s[i:]
+    elif i == len(s):
+        return s.lower()
+    else:
+        ret = s[0:i-1].lower() + s[i-1:]
+    return ret
+
 class Generator(object):
     def __init__(self, opts):
         try:
@@ -418,18 +437,17 @@ Q_SIGNALS: // SIGNALS
 
     def do_prop(self, ifacename, prop):
         name = prop.getAttribute('name')
+        adaptee_name = to_lower_camel_case(name)
         access = prop.getAttribute('access')
         gettername = name
         settername = None
-        docstring = format_docstring(prop, self.refs, '     * ').replace('*/', '&#42;&#47;')
+        if 'write' in access:
+            settername = 'Set' + name
 
         sig = prop.getAttribute('type')
         tptype = prop.getAttributeNS(NS_TP, 'type')
         binding = binding_from_usage(sig, tptype, self.custom_lists, (sig, tptype) in self.externals, self.typesnamespace)
 
-        if 'write' in access:
-            settername = 'Set' + name
-
         if 'read' in access:
             self.h("""\
     %(type)s %(gettername)s() const;
@@ -440,34 +458,35 @@ Q_SIGNALS: // SIGNALS
             self.b("""
 %(type)s %(ifacename)s::%(gettername)s() const
 {
-    return qvariant_cast< %(type)s >(adaptee()->property("%(name)s"));
+    return qvariant_cast< %(type)s >(adaptee()->property("%(adaptee_name)s"));
 }
 """ % {'type': binding.val,
        'ifacename': ifacename,
        'gettername': gettername,
-       'name': (name),
+       'adaptee_name': adaptee_name,
        })
 
         if 'write' in access:
             self.h("""\
-    void %(settername)s(%(type)s newValue);
+    void %(settername)s(const %(type)s &newValue);
 """ % {'settername': settername,
        'type': binding.val,
        })
 
             self.b("""
-void %(ifacename)s::%(settername)s(%(type)s newValue)
+void %(ifacename)s::%(settername)s(const %(type)s &newValue)
 {
-    adaptee()->setProperty("%(name)s", qVariantFromValue(newValue));
+    adaptee()->setProperty("%(adaptee_name)s", qVariantFromValue(newValue));
 }
 """ % {'ifacename': ifacename,
        'settername': settername,
        'type': binding.val,
-       'name': (name),
+       'adaptee_name': adaptee_name,
        })
 
     def do_method(self, ifacename, method):
         name = method.getAttribute('name')
+        adaptee_name = to_lower_camel_case(name)
         args = get_by_path(method, 'arg')
         argnames, argdocstrings, argbindings = extract_arg_or_member_info(args, self.custom_lists,
                 self.externals, self.typesnamespace, self.refs, '     *     ')
@@ -511,12 +530,12 @@ void %(ifacename)s::%(settername)s(%(type)s newValue)
         self.b("""
 %(rettype)s %(ifacename)s::%(name)s(%(params)s)
 {
-    if (!adaptee()->metaObject()->indexOfMethod("%(lname)s(%(normalizedinparams)s)") == -1) {
+    if (!adaptee()->metaObject()->indexOfMethod("%(adaptee_name)s(%(normalizedinparams)s)") == -1) {
         dbusConnection().send(dbusMessage.createErrorReply(TP_QT_ERROR_NOT_IMPLEMENTED, QLatin1String("Not implemented")));
 """ % {'rettype': rettype,
        'ifacename': ifacename,
        'name': name,
-       'lname': (name[0].lower() + name[1:]),
+       'adaptee_name': adaptee_name,
        'normalizedinparams': normalizedinparams,
        'params': params,
        })
@@ -541,13 +560,13 @@ void %(ifacename)s::%(settername)s(%(type)s newValue)
 
         if invokemethodargs:
             self.b("""\
-    QMetaObject::invokeMethod(adaptee(), "%(lname)s",
+    QMetaObject::invokeMethod(adaptee(), "%(adaptee_name)s",
         %(invokemethodargs)s,
         Q_ARG(%(namespace)s::%(ifacename)s::%(name)sContextPtr, ctx));
 """ % {'namespace': self.namespace,
        'ifacename': ifacename,
        'name': name,
-       'lname': (name[0].lower() + name[1:]),
+       'adaptee_name': adaptee_name,
        'invokemethodargs': invokemethodargs,
        })
         else:
@@ -582,13 +601,14 @@ void %(ifacename)s::%(settername)s(%(type)s newValue)
     def do_signals_connect(self, signals):
         for signal in signals:
             name = signal.getAttribute('name')
+            adaptee_name = to_lower_camel_case(name)
             _, _, argbindings = extract_arg_or_member_info(get_by_path(signal, 'arg'),
                     self.custom_lists, self.externals, self.typesnamespace, self.refs, '     *     ')
 
             self.b("""\
-    connect(adaptee, SIGNAL(%(asigname)s(%(params)s)), SIGNAL(%(signame)s(%(params)s)));
-""" % {'asigname': name[0].lower() + name[1:],
-       'signame': name,
+    connect(adaptee, SIGNAL(%(adaptee_name)s(%(params)s)), SIGNAL(%(name)s(%(params)s)));
+""" % {'name': name,
+       'adaptee_name': adaptee_name,
        'params': ', '.join([binding.inarg for binding in argbindings])
        })