summaryrefslogtreecommitdiff
path: root/qt4/tools
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-08 18:37:55 -0200
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-08 18:37:57 -0200
commitc5cf8721a0151e189bfeea48c84c1e53cca29433 (patch)
treebc679ffd348e9a2c593b82d167313d5680d9b4cf /qt4/tools
parent1dbc9733f9befcf36b1083dc243c3f8b710ddef5 (diff)
parentd75e5a10c3874614c5b36bfb830ed35058834db1 (diff)
Merge branch '0_5_0_enums'
Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk>
Diffstat (limited to 'qt4/tools')
-rw-r--r--qt4/tools/qt4-constants-gen.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/qt4/tools/qt4-constants-gen.py b/qt4/tools/qt4-constants-gen.py
index 44f97cf38..a480f8a91 100644
--- a/qt4/tools/qt4-constants-gen.py
+++ b/qt4/tools/qt4-constants-gen.py
@@ -217,6 +217,10 @@ enum %(singular)s
self.do_val(flag, singular, flag == flagvalues[-1])
self.h("""\
+ %s = 0xffffffffU
+""" % ("_" + singular + "Padding"))
+
+ self.h("""\
};
/**
@@ -259,8 +263,12 @@ enum %(singular)s
self.do_val(val, singular, val == vals[-1])
self.h("""\
+ %s = 0xffffffffU
};
+""" % ("_" + singular + "Padding"))
+
+ self.h("""\
/**
* \\ingroup enumtypeconsts
*
@@ -276,8 +284,9 @@ const int NUM_%(upper-plural)s = (%(last-val)s+1);
name = (val.getAttribute('suffix') or val.getAttribute('name')).replace('_', '')
self.h("""\
%s\
- %s = %s%s
-""" % (format_docstring(val, indent=' * ', brackets=(' /**', ' */')), prefix + name, val.getAttribute('value'), (not last and ',\n') or ''))
+ %s = %s,
+
+""" % (format_docstring(val, indent=' * ', brackets=(' /**', ' */')), prefix + name, val.getAttribute('value')))
if __name__ == '__main__':
options, argv = gnu_getopt(argv[1:], '',