diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2010-10-29 15:27:21 -0200 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2010-10-29 15:27:21 -0200 |
| commit | 86c20a6befa16cdc8cbbe1249239535b59f7f8c2 (patch) | |
| tree | f491f3ac9331d7b8d51fda6691d20b21fc313f03 /tools | |
| parent | dd1af064669cfef41755d985eb7f8e81327ee40f (diff) | |
qt4-client-gen.py: Renamed deprecated autogenerated methods starting with __ to start with __deprecated_.
From the 2003 C++ Standard:
Each name that contains a double underscore (__) or begins with an underscore followed by
an uppercase letter (2.11) is reserved to the implementation for any use.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qt4-client-gen.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/qt4-client-gen.py b/tools/qt4-client-gen.py index 960abc42..c9446563 100644 --- a/tools/qt4-client-gen.py +++ b/tools/qt4-client-gen.py @@ -89,6 +89,7 @@ class Generator(object): #include <TelepathyQt4/DBusProxy> #include <TelepathyQt4/Global> +// FIXME: (API/ABI break) Remove definition of TELEPATHY_GNUC_DEPRECATED // basically the same as GLib's G_GNUC_DEPRECATED #ifndef TELEPATHY_GNUC_DEPRECATED # if defined(Q_CC_GNUC) && __GNUC__ >= 4 @@ -351,7 +352,7 @@ public: * Represents property "%(name)s" on the remote object. %(docstring)s\ */ - Q_PROPERTY(%(val)s %(name)s READ __%(gettername)s%(maybesettername)s) + Q_PROPERTY(%(val)s %(name)s READ __deprecated_%(gettername)s%(maybesettername)s) /** * Getter for the remote object property "%(name)s". @@ -363,11 +364,11 @@ public: */ inline TELEPATHY_QT4_DEPRECATED %(val)s %(gettername)s() const { - return __%(gettername)s(); + return __deprecated_%(gettername)s(); } private: - inline %(val)s __%(gettername)s() const + inline %(val)s __deprecated_%(gettername)s() const { return %(getter-return)s; } @@ -377,7 +378,7 @@ private: 'val' : binding.val, 'name' : name, 'gettername' : gettername, - 'maybesettername' : settername and (' WRITE __' + settername) or '', + 'maybesettername' : settername and (' WRITE __deprecated_' + settername) or '', 'getter-return' : 'read' in access and ('qvariant_cast<%s>(internalPropGet("%s"))' % (binding.val, name)) or binding.val + '()'}) if settername: @@ -392,11 +393,11 @@ public: */ inline TELEPATHY_QT4_DEPRECATED void %s(%s newValue) { - return __%s(newValue); + return __deprecated_%s(newValue); } private: - inline void __%s(%s newValue) + inline void __deprecated_%s(%s newValue) { internalPropSet("%s", QVariant::fromValue(newValue)); } |