Skip to content

Commit c3d7220

Browse files
iakovmrbean-bremen
authored andcommitted
Fix build with PYTHONQT_DEBUG enabled
1 parent 12c6c91 commit c3d7220

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

generator/generatorsetqtscript.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GeneratorSetQtScript::GeneratorSetQtScript()
5454
QString GeneratorSetQtScript::usage() {
5555
QString usage =
5656
"QtScript:\n"
57-
" --nothing-to-report-yet \n";
57+
" --nothing-to-report-yet \n"
5858
" --max-classes-per-file=<n> \n";
5959

6060
return usage;

generator/typeparser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Scanner::Token Scanner::nextToken()
122122
m_pos += 2;
123123
break;
124124
}
125+
Q_FALLTHROUGH();
125126
default:
126127
if (c.isLetterOrNumber() || c == '_')
127128
tok = Identifier;

generator/typesystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ class Handler : public QXmlDefaultHandler
155155
public:
156156
Handler(TypeDatabase *database, unsigned int qtVersion, bool generate)
157157
: m_database(database)
158-
, m_qtVersion(qtVersion)
159158
, m_generate(generate ? TypeEntry::GenerateAll : TypeEntry::GenerateForSubclass)
159+
, m_qtVersion(qtVersion)
160160
{
161161
m_current_enum = 0;
162162
current = 0;

src/PythonQtClassInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ bool PythonQtClassInfo::lookForEnumAndCache(const QMetaObject* meta, const char*
295295
PythonQtMemberInfo newInfo(enumValuePtr);
296296
_cachedMembers.insert(memberName, newInfo);
297297
#ifdef PYTHONQT_DEBUG
298-
std::cout << "caching enum " << memberName << " on " << meta->className()->constData() << std::endl;
298+
std::cout << "caching enum " << memberName << " on " << meta->className() << std::endl;
299299
#endif
300300
found = true;
301301
break;

src/PythonQtMethodInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool PythonQtSlotInfo::_globalShouldAllowThreads = false;
5252
PythonQtMethodInfo::PythonQtMethodInfo(const QMetaMethod& meta, PythonQtClassInfo* classInfo)
5353
{
5454
#ifdef PYTHONQT_DEBUG
55-
QByteArray sig = PythonQtUtils::signature(meta));
55+
QByteArray sig = PythonQtUtils::signature(meta);
5656
sig = sig.mid(sig.indexOf('('));
5757
QByteArray fullSig = QByteArray(meta.typeName()) + " " + sig;
5858
std::cout << "caching " << fullSig.data() << std::endl;

0 commit comments

Comments
 (0)