Skip to content

Commit 860e330

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 37f8790 commit 860e330

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

src/PythonQtConversion.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,23 +660,26 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
660660
// Handle QStringView, which needs a reference to a persistent QString
661661
QString str = PyObjGetString(obj, strict, ok);
662662
if (ok) {
663-
return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QStringView>(alreadyAllocatedCPPObject, frame, str);
663+
return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QStringView>(alreadyAllocatedCPPObject, frame,
664+
str);
664665
} else {
665666
return nullptr;
666667
}
667668
} else if (info.typeId == anyStringViewTypeId) {
668669
// Handle QAnyStringView, which needs a reference to a persistent QString
669670
QString str = PyObjGetString(obj, strict, ok);
670671
if (ok) {
671-
return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QAnyStringView>(alreadyAllocatedCPPObject, frame, str);
672+
return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QAnyStringView>(alreadyAllocatedCPPObject,
673+
frame, str);
672674
} else {
673675
return nullptr;
674676
}
675677
} else if (info.typeId == byteArrayViewTypeId) {
676678
// Handle QByteArrayView, which needs a reference to a persistent QByteArray
677679
QByteArray ba = PyObjGetBytesAllowString(obj, strict, ok);
678680
if (ok) {
679-
return ConversionUtils::getPtrAndUpdateCppViewObject<QByteArray, QByteArrayView>(alreadyAllocatedCPPObject, frame, ba);
681+
return ConversionUtils::getPtrAndUpdateCppViewObject<QByteArray, QByteArrayView>(alreadyAllocatedCPPObject,
682+
frame, ba);
680683
} else {
681684
return nullptr;
682685
}

src/PythonQtMisc.h

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -134,35 +134,34 @@ class PythonQtArgumentFrame
134134
};
135135

136136
namespace ConversionUtils {
137-
template<typename Class>
138-
void* getPtrAndUpdateCppObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
139-
{
140-
if (alreadyAllocatedPtr) {
141-
*reinterpret_cast<Class*>(alreadyAllocatedPtr) = value;
142-
return alreadyAllocatedPtr;
143-
}
144-
else {
145-
QVariant* item = store->nextVariantPtr();
146-
*item = QVariant(value);
147-
return const_cast<void*>(item->constData());
148-
}
137+
template<typename Class>
138+
void* getPtrAndUpdateCppObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
139+
{
140+
if (alreadyAllocatedPtr) {
141+
*reinterpret_cast<Class*>(alreadyAllocatedPtr) = value;
142+
return alreadyAllocatedPtr;
143+
} else {
144+
QVariant* item = store->nextVariantPtr();
145+
*item = QVariant(value);
146+
return const_cast<void*>(item->constData());
149147
}
148+
}
150149

151-
template<typename Class, typename ViewClass>
152-
void* getPtrAndUpdateCppViewObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
153-
{
154-
QVariant* itemStore = store->nextVariantPtr();
155-
*itemStore = QVariant(value);
156-
if (alreadyAllocatedPtr) {
157-
*reinterpret_cast<ViewClass*>(alreadyAllocatedPtr) = ViewClass(*reinterpret_cast<const Class*>(itemStore->constData()));
158-
return alreadyAllocatedPtr;
159-
}
160-
else {
161-
QVariant* item = store->nextVariantPtr();
162-
*item = QVariant::fromValue(ViewClass(*reinterpret_cast<const Class*>(itemStore->constData())));
163-
return const_cast<void*>(item->constData());
164-
}
150+
template<typename Class, typename ViewClass>
151+
void* getPtrAndUpdateCppViewObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
152+
{
153+
QVariant* itemStore = store->nextVariantPtr();
154+
*itemStore = QVariant(value);
155+
if (alreadyAllocatedPtr) {
156+
*reinterpret_cast<ViewClass*>(alreadyAllocatedPtr) =
157+
ViewClass(*reinterpret_cast<const Class*>(itemStore->constData()));
158+
return alreadyAllocatedPtr;
159+
} else {
160+
QVariant* item = store->nextVariantPtr();
161+
*item = QVariant::fromValue(ViewClass(*reinterpret_cast<const Class*>(itemStore->constData())));
162+
return const_cast<void*>(item->constData());
165163
}
166164
}
165+
}
167166

168167
#endif

0 commit comments

Comments
 (0)