Skip to content

Commit 9174777

Browse files
florianlinkflorianlink
committed
replaced signals, slots and foreach with Q_* macros
1 parent 94b2db9 commit 9174777

14 files changed

Lines changed: 38 additions & 38 deletions

‎src/PythonQt.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ void PythonQtPrivate::setupSharedLibrarySuffixes()
11801180
_sharedLibrarySuffixes << "_d.so";
11811181
#endif
11821182
#endif
1183-
foreach (QVariant entry, result.toList()) {
1183+
Q_FOREACH (QVariant entry, result.toList()) {
11841184
QVariantList suffixEntry = entry.toList();
11851185
if (suffixEntry.count()==3) {
11861186
int code = suffixEntry.at(2).toInt();
@@ -1249,7 +1249,7 @@ void PythonQtPrivate::addDecorators(QObject* o, int decoTypes)
12491249

12501250
void PythonQtPrivate::registerQObjectClassNames(const QStringList& names)
12511251
{
1252-
foreach(QString name, names) {
1252+
Q_FOREACH(QString name, names) {
12531253
_knownQObjectClassNames.insert(name.toLatin1(), true);
12541254
}
12551255
}
@@ -1652,7 +1652,7 @@ PyObject* PythonQt::helpCalled(PythonQtClassInfo* info)
16521652

16531653
void PythonQt::clearNotFoundCachedMembers()
16541654
{
1655-
foreach(PythonQtClassInfo* info, _p->_knownClassInfos) {
1655+
Q_FOREACH(PythonQtClassInfo* info, _p->_knownClassInfos) {
16561656
info->clearNotFoundCachedMembers();
16571657
}
16581658
}

‎src/PythonQt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
516516

517517
//@}
518518

519-
signals:
519+
Q_SIGNALS:
520520
//! emitted when python outputs something to stdout (and redirection is turned on)
521521
void pythonStdOut(const QString& str);
522522
//! emitted when python outputs something to stderr (and redirection is turned on)

‎src/PythonQtClassInfo.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ PythonQtClassInfo::~PythonQtClassInfo()
7272
if (_destructor) {
7373
_destructor->deleteOverloadsAndThis();
7474
}
75-
foreach(PythonQtSlotInfo* info, _decoratorSlots) {
75+
Q_FOREACH(PythonQtSlotInfo* info, _decoratorSlots) {
7676
info->deleteOverloadsAndThis();
7777
}
7878
}
@@ -151,7 +151,7 @@ bool PythonQtClassInfo::lookForPropertyAndCache(const char* memberName)
151151
PythonQtSlotInfo* PythonQtClassInfo::recursiveFindDecoratorSlotsFromDecoratorProvider(const char* memberName, PythonQtSlotInfo* inputInfo, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset)
152152
{
153153
inputInfo = findDecoratorSlotsFromDecoratorProvider(memberName, inputInfo, found, memberCache, upcastingOffset);
154-
foreach(const ParentClassInfo& info, _parentClasses) {
154+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
155155
inputInfo = info._parent->recursiveFindDecoratorSlotsFromDecoratorProvider(memberName, inputInfo, found, memberCache, upcastingOffset+info._upcastingOffset);
156156
}
157157
return inputInfo;
@@ -309,7 +309,7 @@ PythonQtMemberInfo PythonQtClassInfo::member(const char* memberName)
309309
// look for dynamic decorators in this class and in derived classes
310310
QList<QObject*> decoObjects;
311311
recursiveCollectDecoratorObjects(decoObjects);
312-
foreach(QObject* deco, decoObjects) {
312+
Q_FOREACH(QObject* deco, decoObjects) {
313313
// call on ourself for caching, but with different metaObject():
314314
found = lookForEnumAndCache(deco->metaObject(), memberName);
315315
if (found) {
@@ -357,14 +357,14 @@ void PythonQtClassInfo::recursiveCollectDecoratorObjects(QList<QObject*>& decora
357357
if (deco) {
358358
decoratorObjects.append(deco);
359359
}
360-
foreach(const ParentClassInfo& info, _parentClasses) {
360+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
361361
info._parent->recursiveCollectDecoratorObjects(decoratorObjects);
362362
}
363363
}
364364

365365
void PythonQtClassInfo::recursiveCollectClassInfos(QList<PythonQtClassInfo*>& classInfoObjects) {
366366
classInfoObjects.append(this);
367-
foreach(const ParentClassInfo& info, _parentClasses) {
367+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
368368
info._parent->recursiveCollectClassInfos(classInfoObjects);
369369
}
370370
}
@@ -495,7 +495,7 @@ QStringList PythonQtClassInfo::memberList()
495495
// look for dynamic decorators in this class and in derived classes
496496
QList<PythonQtClassInfo*> infos;
497497
recursiveCollectClassInfos(infos);
498-
foreach(PythonQtClassInfo* info, infos) {
498+
Q_FOREACH(PythonQtClassInfo* info, infos) {
499499
info->listDecoratorSlotsFromDecoratorProvider(l, false);
500500
}
501501
}
@@ -508,11 +508,11 @@ QStringList PythonQtClassInfo::memberList()
508508
// check enums in the class hierachy of CPP classes
509509
QList<QObject*> decoObjects;
510510
recursiveCollectDecoratorObjects(decoObjects);
511-
foreach(QObject* deco, decoObjects) {
511+
Q_FOREACH(QObject* deco, decoObjects) {
512512
enumMetaObjects << deco->metaObject();
513513
}
514514

515-
foreach(const QMetaObject* meta, enumMetaObjects) {
515+
Q_FOREACH(const QMetaObject* meta, enumMetaObjects) {
516516
for (int i = 0; i<meta->enumeratorCount(); i++) {
517517
QMetaEnum e = meta->enumerator(i);
518518
l << e.name();
@@ -541,7 +541,7 @@ void* PythonQtClassInfo::castTo(void* ptr, const char* classname)
541541
if (_wrappedClassName == classname) {
542542
return ptr;
543543
}
544-
foreach(const ParentClassInfo& info, _parentClasses) {
544+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
545545
void* result = info._parent->castTo((char*)ptr + info._upcastingOffset, classname);
546546
if (result) {
547547
return result;
@@ -555,7 +555,7 @@ bool PythonQtClassInfo::inherits(const char* name)
555555
if (_wrappedClassName == name) {
556556
return true;
557557
}
558-
foreach(const ParentClassInfo& info, _parentClasses) {
558+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
559559
if (info._parent->inherits(name)) {
560560
return true;
561561
}
@@ -568,7 +568,7 @@ bool PythonQtClassInfo::inherits(PythonQtClassInfo* classInfo)
568568
if (classInfo == this) {
569569
return true;
570570
}
571-
foreach(const ParentClassInfo& info, _parentClasses) {
571+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
572572
if (info._parent->inherits(classInfo)) {
573573
return true;
574574
}
@@ -725,14 +725,14 @@ QObject* PythonQtClassInfo::decorator()
725725
void* PythonQtClassInfo::recursiveCastDownIfPossible(void* ptr, const char** resultClassName)
726726
{
727727
if (!_polymorphicHandlers.isEmpty()) {
728-
foreach(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
728+
Q_FOREACH(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
729729
void* resultPtr = (*cb)(ptr, resultClassName);
730730
if (resultPtr) {
731731
return resultPtr;
732732
}
733733
}
734734
}
735-
foreach(const ParentClassInfo& info, _parentClasses) {
735+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
736736
if (!info._parent->isQObject()) {
737737
void* resultPtr = info._parent->recursiveCastDownIfPossible((char*)ptr + info._upcastingOffset, resultClassName);
738738
if (resultPtr) {
@@ -752,7 +752,7 @@ void* PythonQtClassInfo::castDownIfPossible(void* ptr, PythonQtClassInfo** resul
752752
// we only do downcasting on the base object, not on the whole inheritance tree...
753753
void* resultPtr = NULL;
754754
if (!_polymorphicHandlers.isEmpty()) {
755-
foreach(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
755+
Q_FOREACH(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
756756
resultPtr = (*cb)(ptr, &className);
757757
if (resultPtr) {
758758
break;
@@ -815,7 +815,7 @@ void PythonQtClassInfo::createEnumWrappers()
815815
if (decorator()) {
816816
createEnumWrappers(decorator()->metaObject());
817817
}
818-
foreach(const ParentClassInfo& info, _parentClasses) {
818+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
819819
info._parent->createEnumWrappers();
820820
}
821821
}
@@ -826,13 +826,13 @@ PyObject* PythonQtClassInfo::findEnumWrapper(const char* name) {
826826
if (!_enumsCreated) {
827827
createEnumWrappers();
828828
}
829-
foreach(const PythonQtObjectPtr& p, _enumWrappers) {
829+
Q_FOREACH(const PythonQtObjectPtr& p, _enumWrappers) {
830830
const char* className = ((PyTypeObject*)p.object())->tp_name;
831831
if (qstrcmp(className, name)==0) {
832832
return p.object();
833833
}
834834
}
835-
foreach(const ParentClassInfo& info, _parentClasses) {
835+
Q_FOREACH(const ParentClassInfo& info, _parentClasses) {
836836
PyObject* p = info._parent->findEnumWrapper(name);
837837
if (p) return p;
838838
}

‎src/PythonQtClassWrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
331331
PyObject* dict = PyDict_New();
332332

333333
QStringList l = wrapper->classInfo()->memberList();
334-
foreach (QString name, l) {
334+
Q_FOREACH (QString name, l) {
335335
PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
336336
if (o) {
337337
PyDict_SetItemString(dict, name.toLatin1().data(), o);

‎src/PythonQtConversion.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ PyObject* PythonQtConv::QStringListToPyObject(const QStringList& list)
11191119
PyObject* result = PyTuple_New(list.count());
11201120
int i = 0;
11211121
QString str;
1122-
foreach (str, list) {
1122+
Q_FOREACH (str, list) {
11231123
PyTuple_SET_ITEM(result, i, PythonQtConv::QStringToPyObject(str));
11241124
i++;
11251125
}
@@ -1173,7 +1173,7 @@ PyObject* PythonQtConv::QVariantListToPyObject(const QVariantList& l) {
11731173
PyObject* result = PyTuple_New(l.count());
11741174
int i = 0;
11751175
QVariant v;
1176-
foreach (v, l) {
1176+
Q_FOREACH (v, l) {
11771177
PyTuple_SET_ITEM(result, i, PythonQtConv::QVariantToPyObject(v));
11781178
i++;
11791179
}
@@ -1186,7 +1186,7 @@ PyObject* PythonQtConv::ConvertQListOfPointerTypeToPythonList(QList<void*>* list
11861186
{
11871187
PyObject* result = PyTuple_New(list->count());
11881188
int i = 0;
1189-
foreach (void* value, *list) {
1189+
Q_FOREACH (void* value, *list) {
11901190
PyTuple_SET_ITEM(result, i, PythonQt::priv()->wrapPtr(value, typeName));
11911191
i++;
11921192
}

‎src/PythonQtConversion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ PyObject* PythonQtConvertListOfValueTypeToPythonList(const void* /*QList<T>* */
180180
}
181181
PyObject* result = PyTuple_New(list->size());
182182
int i = 0;
183-
foreach (const T& value, *list) {
183+
Q_FOREACH (const T& value, *list) {
184184
PyTuple_SET_ITEM(result, i, PythonQtConv::ConvertQtValueToPythonInternal(innerType, &value));
185185
i++;
186186
}

‎src/PythonQtImporter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ PythonQtImport::ModuleInfo PythonQtImport::getModuleInfo(PythonQtImporter* self,
108108
}
109109
}
110110
// test if it is a shared library
111-
foreach(const QString& suffix, PythonQt::priv()->sharedLibrarySuffixes()) {
111+
Q_FOREACH(const QString& suffix, PythonQt::priv()->sharedLibrarySuffixes()) {
112112
test = path+suffix;
113113
if (PythonQt::importInterface()->exists(test)) {
114114
info.fullPath = test;
@@ -136,7 +136,7 @@ int PythonQtImporter_init(PythonQtImporter *self, PyObject *args, PyObject * /*k
136136
QString path(cpath);
137137
if (PythonQt::importInterface()->exists(path)) {
138138
const QStringList& ignorePaths = PythonQt::self()->getImporterIgnorePaths();
139-
foreach(QString ignorePath, ignorePaths) {
139+
Q_FOREACH(QString ignorePath, ignorePaths) {
140140
if (path.startsWith(ignorePath)) {
141141
PyErr_SetString(PythonQtImportError,
142142
"path ignored");

‎src/PythonQtInstanceWrapper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
352352
// only the properties are missing, the rest is already available from
353353
// PythonQtClassWrapper...
354354
QStringList l = wrapper->classInfo()->propertyList();
355-
foreach (QString name, l) {
355+
Q_FOREACH (QString name, l) {
356356
PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
357357
if (o) {
358358
PyDict_SetItemString(dict, name.toLatin1().data(), o);
@@ -363,7 +363,7 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
363363
}
364364

365365
QList<QByteArray> dynamicProps = wrapper->_obj->dynamicPropertyNames();
366-
foreach (QByteArray name, dynamicProps) {
366+
Q_FOREACH (QByteArray name, dynamicProps) {
367367
PyObject* o = PyObject_GetAttrString(obj, name.data());
368368
if (o) {
369369
PyDict_SetItemString(dict, name.data(), o);

‎src/PythonQtMethodInfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PythonQtMethodInfo::PythonQtMethodInfo(const QMetaMethod& meta, PythonQtClassInf
5959
fillParameterInfo(type, QByteArray(meta.typeName()), classInfo);
6060
_parameters.append(type);
6161
QList<QByteArray> names = meta.parameterTypes();
62-
foreach (const QByteArray& name, names) {
62+
Q_FOREACH (const QByteArray& name, names) {
6363
fillParameterInfo(type, name, classInfo);
6464
_parameters.append(type);
6565
}
@@ -70,7 +70,7 @@ PythonQtMethodInfo::PythonQtMethodInfo(const QByteArray& typeName, const QList<Q
7070
ParameterInfo type;
7171
fillParameterInfo(type, typeName, NULL);
7272
_parameters.append(type);
73-
foreach (const QByteArray& name, args) {
73+
Q_FOREACH (const QByteArray& name, args) {
7474
fillParameterInfo(type, name, NULL);
7575
_parameters.append(type);
7676
}

‎src/PythonQtMisc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ template <typename T, int chunkEntries> class PythonQtValueStorage
8383
//! clear all memory
8484
void clear() {
8585
T* chunk;
86-
foreach(chunk, _chunks) {
86+
Q_FOREACH(chunk, _chunks) {
8787
delete[]chunk;
8888
}
8989
_chunks.clear();

0 commit comments

Comments
 (0)