Revert part of r91 preventing QFlags from being wrapped

By checking if an enum member has already been cached it is not required
anymore to skip it if is a QFlags.

Additionally, the wrapping of QFlags can now be done by using
only Q_FLAGS without having a corresponding Q_ENUMS.

Author: jcfr

README.md

@@ -50,6 +50,8 @@ This repository contains three branches:
 * Based on patched-3 + [r245](http://sourceforge.net/p/pythonqt/code/245/)
 * List of features:
  * Add BUILD_TESTING option disabled by default to keep behavior consistent with previous version.
+ * Do not exclude enums from wrapping if they are QFlags.
+ * Ensure enums added using only Q_FLAGS without corresponding Q_ENUMS are wrapped.
 
 ### patched-3
 * Backported:

src/PythonQtClassInfo.cpp

@@ -264,9 +264,12 @@ bool PythonQtClassInfo::lookForEnumAndCache(const QMetaObject* meta, const char*
   int enumCount = meta->enumeratorCount();
   for (int i=0;i<enumCount; i++) {
     QMetaEnum e = meta->enumerator(i);
-    // we do not want flags, they will cause our values to appear two times
-    if (e.isFlag()) continue;
-    
+    if (_cachedMembers.contains(memberName)) {
+  #ifdef PYTHONQT_DEBUG
+      std::cout << "cached enum " << memberName << " on " << meta->className()  << std::endl;
+  #endif
+      continue;
+      }
     for (int j=0; j < e.keyCount(); j++) {
       if (qstrcmp(e.key(j), memberName)==0) {
         PyObject* enumType = findEnumWrapper(e.name());
@@ -527,9 +530,6 @@ QStringList PythonQtClassInfo::memberList()
     for (int i = 0; i<meta->enumeratorCount(); i++) {
       QMetaEnum e = meta->enumerator(i);
       l << e.name();
-      // we do not want flags, they will cause our values to appear two times
-      if (e.isFlag()) continue;
-
       for (int j=0; j < e.keyCount(); j++) {
         l << QString(e.key(j));
       }

tests/PythonQtTests.cpp

@@ -298,8 +298,21 @@ void PythonQtTestSlotCalling::testCppFactory()
   // with int overload to check overloading
   QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObject2\na = PQCppObject2()\nif a.testEnumFlag3(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
 
+  PythonQt::self()->registerCPPClass("PQCppObjectQFlagOnly",NULL,NULL, PythonQtCreateObject<PQCppObjectQFlagOnlyDecorator>);
+
+
+  // local enum (decorated)
+  QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectQFlagOnly\na = PQCppObjectQFlagOnly()\nprint a.testEnumFlag1\nif a.testEnumFlag1(PQCppObjectQFlagOnly.TestEnumValue2)==PQCppObjectQFlagOnly.TestEnumValue2: obj.setPassed();\n"));
+
+  // enum with namespace (decorated)
+  QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectQFlagOnly\na = PQCppObjectQFlagOnly()\nif a.testEnumFlag2(PQCppObjectQFlagOnly.TestEnumValue2)==PQCppObjectQFlagOnly.TestEnumValue2: obj.setPassed();\n"));
+  // with int overload to check overloading
+  QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectQFlagOnly\na = PQCppObjectQFlagOnly()\nif a.testEnumFlag3(PQCppObjectQFlagOnly.TestEnumValue2)==PQCppObjectQFlagOnly.TestEnumValue2: obj.setPassed();\n"));
+
 }
 
+// PQCppObject2Decorator
+
 PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag1(PQCppObject2* obj, PQCppObject2Decorator::TestEnumFlag flag) {
   return flag;
 }
@@ -316,6 +329,26 @@ PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag3(PQCppOb
   return flag;
 }
 
+// PQCppObjectQFlagOnlyDecorator
+
+PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag1(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
+  return flag;
+}
+
+PQCppObjectQFlagOnly::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag2(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnly::TestEnumFlag flag) {
+  return flag;
+}
+
+// with int overload
+PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, int flag) {
+  return (TestEnumFlag)-1;
+}
+PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
+  return flag;
+}
+
+// PythonQtTestSlotCalling
+
 void PythonQtTestSlotCalling::testMultiArgsSlotCall()
 {
   QVERIFY(_helper->runScript("if obj.getMultiArgs(12,47.11,'test')==(12,47.11,'test'): obj.setPassed();\n"));

tests/PythonQtTests.h

@@ -293,6 +293,36 @@ class PQCppObject2Decorator : public QObject {
 
 };
 
+typedef PQCppObject2 PQCppObjectQFlagOnly;
+
+class PQCppObjectQFlagOnlyDecorator : public QObject {
+  Q_OBJECT
+
+public:
+  Q_FLAGS(TestEnumFlag)
+
+  enum TestEnumFlag {
+    TestEnumValue1 = 0,
+    TestEnumValue2 = 1
+  };
+
+  Q_DECLARE_FLAGS(TestEnum, TestEnumFlag)
+
+  public slots:
+  PQCppObjectQFlagOnly* new_PQCppObjectQFlagOnly() {
+    return new PQCppObjectQFlagOnly();
+  }
+
+  TestEnumFlag testEnumFlag1(PQCppObjectQFlagOnly* obj, TestEnumFlag flag);
+
+  PQCppObjectQFlagOnly::TestEnumFlag testEnumFlag2(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnly::TestEnumFlag flag);
+
+  // with int overload
+  TestEnumFlag testEnumFlag3(PQCppObjectQFlagOnly* obj, int flag);
+  TestEnumFlag testEnumFlag3(PQCppObjectQFlagOnly* obj, TestEnumFlag flag);
+
+};
+
 class PQUnknownValueObject
 {
 public: