rpms/kdebindings/devel kdebindings-4.4.92-qt47.patch,1.2,1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26717/devel

Modified Files:
	kdebindings-4.4.92-qt47.patch 
Log Message:
Fix the generator so it honors excludes in global enums.

kdebindings-4.4.92-qt47.patch:
 generator/generators/smoke/helpers.cpp |    5 +++++
 smoke/qtgui/smokeconfig.xml            |    8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: kdebindings-4.4.92-qt47.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.4.92-qt47.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.4.92-qt47.patch	9 Jul 2010 02:12:42 -0000	1.2
+++ kdebindings-4.4.92-qt47.patch	9 Jul 2010 03:47:50 -0000	1.3
@@ -1,17 +1,32 @@
+diff -ur kdebindings-4.4.92/generator/generators/smoke/helpers.cpp kdebindings-4.4.92-qt47/generator/generators/smoke/helpers.cpp
+--- kdebindings-4.4.92/generator/generators/smoke/helpers.cpp	2010-05-27 19:21:49.000000000 +0200
++++ kdebindings-4.4.92-qt47/generator/generators/smoke/helpers.cpp	2010-07-09 05:46:48.000000000 +0200
+@@ -166,6 +166,11 @@
+                 t = Type::registerType(Type(&e));
+             }
+             (*usedTypes) << t;
++            foreach (const EnumMember& member, e.members()) {
++                if (Options::typeExcluded(member.toString())) {
++                    e.membersRef().removeOne(member);
++                }
++            }
+             parent->appendChild(&e);
+         }
+     }
 diff -ur kdebindings-4.4.92/smoke/qtgui/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtgui/smokeconfig.xml
 --- kdebindings-4.4.92/smoke/qtgui/smokeconfig.xml	2010-04-07 13:24:17.000000000 +0200
-+++ kdebindings-4.4.92-qt47/smoke/qtgui/smokeconfig.xml	2010-07-09 04:11:31.000000000 +0200
++++ kdebindings-4.4.92-qt47/smoke/qtgui/smokeconfig.xml	2010-07-09 05:45:45.000000000 +0200
 @@ -30,7 +30,13 @@
          <signature>.*qFrom.*Endian_helper.*</signature>
          <signature>.*QPixmapData.*</signature>
          <signature>.*qt_x11_getX11InfoForWindow.*</signature>
 -   </exclude>
 +        <!-- enum items from Qt 4.7 qs60style.h which cause compiler errors -->
-+        <signature>.*PM_FrameCornerWidth.*</signature>
-+        <signature>.*PM_FrameCornerHeight.*</signature>
-+        <signature>.*PM_BoldLineWidth.*</signature>
-+        <signature>.*PM_ThinLineWidth.*</signature>
-+        <signature>.*PM_MessageBoxHeight.*</signature>
++        <signature>.*::PM_FrameCornerWidth</signature>
++        <signature>.*::PM_FrameCornerHeight</signature>
++        <signature>.*::PM_BoldLineWidth</signature>
++        <signature>.*::PM_ThinLineWidth</signature>
++        <signature>.*::PM_MessageBoxHeight</signature>
 +    </exclude>
      <functions>
          <!-- include functions starting with 'q' -->