Fix build with PYTHONQT_DEBUG enabled

MeVisLab · May 7, 2024 · c3d7220 · c3d7220
1 parent 12c6c91
commit c3d7220
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/generator/generatorsetqtscript.cpp b/generator/generatorsetqtscript.cpp
@@ -54,7 +54,7 @@ GeneratorSetQtScript::GeneratorSetQtScript()
 QString GeneratorSetQtScript::usage() {
     QString usage =
         "QtScript:\n" 
-        "  --nothing-to-report-yet                   \n";
+        "  --nothing-to-report-yet                   \n"
         "  --max-classes-per-file=<n>                \n";
 
     return usage;

diff --git a/generator/typeparser.cpp b/generator/typeparser.cpp
@@ -122,6 +122,7 @@ Scanner::Token Scanner::nextToken()
                     m_pos += 2;
                     break;
                 }
+            Q_FALLTHROUGH();
             default:
                 if (c.isLetterOrNumber() || c == '_')
                     tok = Identifier;

diff --git a/generator/typesystem.cpp b/generator/typesystem.cpp
@@ -155,8 +155,8 @@ class Handler : public QXmlDefaultHandler
 public:
     Handler(TypeDatabase *database, unsigned int qtVersion, bool generate)
         : m_database(database)
-        , m_qtVersion(qtVersion)
         , m_generate(generate ? TypeEntry::GenerateAll : TypeEntry::GenerateForSubclass)
+        , m_qtVersion(qtVersion)
     {
         m_current_enum = 0;
         current = 0;

diff --git a/src/PythonQtClassInfo.cpp b/src/PythonQtClassInfo.cpp
@@ -295,7 +295,7 @@ bool PythonQtClassInfo::lookForEnumAndCache(const QMetaObject* meta, const char*
           PythonQtMemberInfo newInfo(enumValuePtr);
           _cachedMembers.insert(memberName, newInfo);
   #ifdef PYTHONQT_DEBUG
-          std::cout << "caching enum " << memberName << " on " << meta->className()->constData() << std::endl;
+          std::cout << "caching enum " << memberName << " on " << meta->className() << std::endl;
   #endif
           found = true;
           break;

diff --git a/src/PythonQtMethodInfo.cpp b/src/PythonQtMethodInfo.cpp
@@ -52,7 +52,7 @@ bool PythonQtSlotInfo::_globalShouldAllowThreads = false;
 PythonQtMethodInfo::PythonQtMethodInfo(const QMetaMethod& meta, PythonQtClassInfo* classInfo)
 {
 #ifdef PYTHONQT_DEBUG
-  QByteArray sig = PythonQtUtils::signature(meta));
+  QByteArray sig = PythonQtUtils::signature(meta);
   sig = sig.mid(sig.indexOf('('));
   QByteArray fullSig = QByteArray(meta.typeName()) + " " + sig;
   std::cout << "caching " << fullSig.data() << std::endl;