Skip to content

Commit 990cfab

Browse files
texpertjcfr
andcommitted
Fix unused variable warning in PythonQtSlot
Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>
1 parent 49c5b5b commit 990cfab

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

src/PythonQtSlot.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,13 @@ bool PythonQtCallSlot(PythonQtClassInfo* classInfo, QObject* objectToCall, PyObj
8484
argList[0] = NULL;
8585

8686
bool ok = true;
87-
bool skipFirst = false;
8887
PythonQtPassThisOwnershipType passThisOwnership = IgnoreOwnership;
8988

9089
int instanceDecoOffset = 0;
9190
// it is important to keep arg1 on this scope, because it is stored in argList[1] and
9291
// would go away if it is moved into the if scope
9392
void* arg1 = NULL;
9493
if (info->isInstanceDecorator()) {
95-
skipFirst = true;
9694
instanceDecoOffset = 1;
9795

9896
// for decorators on CPP objects, we take the cpp ptr, for QObjects we take the QObject pointer

src/PythonQtStdIn.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ static PyObject *PythonQtStdInRedirect_new(PyTypeObject *type, PyObject * /*args
5353

5454
static PyObject *PythonQtStdInRedirect_readline(PyObject * self, PyObject * args)
5555
{
56+
Q_UNUSED(args);
5657
PythonQtStdInRedirect* s = (PythonQtStdInRedirect*)self;
5758
QString string;
5859
if (s->_cb) {

tests/PythonQtTests.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -314,36 +314,46 @@ void PythonQtTestSlotCalling::testCppFactory()
314314
// PQCppObject2Decorator
315315

316316
PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag1(PQCppObject2* obj, PQCppObject2Decorator::TestEnumFlag flag) {
317+
Q_UNUSED(obj);
317318
return flag;
318319
}
319320

320321
PQCppObject2::TestEnumFlag PQCppObject2Decorator::testEnumFlag2(PQCppObject2* obj, PQCppObject2::TestEnumFlag flag) {
322+
Q_UNUSED(obj);
321323
return flag;
322324
}
323325

324326
// with int overload
325327
PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag3(PQCppObject2* obj, int flag) {
328+
Q_UNUSED(obj);
329+
Q_UNUSED(flag);
326330
return (TestEnumFlag)-1;
327331
}
328332
PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag3(PQCppObject2* obj, PQCppObject2Decorator::TestEnumFlag flag) {
333+
Q_UNUSED(obj);
329334
return flag;
330335
}
331336

332337
// PQCppObjectQFlagOnlyDecorator
333338

334339
PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag1(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
340+
Q_UNUSED(obj);
335341
return flag;
336342
}
337343

338344
PQCppObjectQFlagOnly::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag2(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnly::TestEnumFlag flag) {
345+
Q_UNUSED(obj);
339346
return flag;
340347
}
341348

342349
// with int overload
343350
PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, int flag) {
351+
Q_UNUSED(obj);
352+
Q_UNUSED(flag);
344353
return (TestEnumFlag)-1;
345354
}
346355
PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
356+
Q_UNUSED(obj);
347357
return flag;
348358
}
349359

@@ -616,23 +626,27 @@ void PythonQtTestApi::testQColorDecorators()
616626

617627
QByteArray PythonQtTestApiHelper::readFileAsBytes(const QString& filename)
618628
{
629+
Q_UNUSED(filename);
619630
QByteArray b;
620631
return b;
621632
}
622633

623634
QByteArray PythonQtTestApiHelper::readSourceFile(const QString& filename, bool& ok)
624635
{
636+
Q_UNUSED(filename);
625637
QByteArray b;
626638
ok = true;
627639
return b;
628640
}
629641

630642
bool PythonQtTestApiHelper::exists(const QString& filename)
631643
{
644+
Q_UNUSED(filename);
632645
return true;
633646
}
634647

635648
QDateTime PythonQtTestApiHelper::lastModifiedDate(const QString& filename) {
649+
Q_UNUSED(filename);
636650
return QDateTime::currentDateTime();
637651
}
638652

@@ -656,6 +670,7 @@ void PythonQtTestApiHelper::stdErr(const QString& s)
656670

657671
QObject* PythonQtTestCppFactory::create(const QByteArray& name, void *ptr)
658672
{
673+
Q_UNUSED(name);
659674
if (name == "PQCppObject") {
660675
return new PQCppObjectWrapper(ptr);
661676
}

tests/PythonQtTests.h

+9-7
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,11 @@ public Q_SLOTS:
240240
return new PQCppObjectNoWrap(0);
241241
}
242242
PQCppObjectNoWrap* new_PQCppObjectNoWrap(const PQCppObjectNoWrap& other) {
243+
Q_UNUSED(other);
243244
return new PQCppObjectNoWrap(1);
244245
}
245246
PQCppObjectNoWrap* new_PQCppObjectNoWrap(double value) {
247+
Q_UNUSED(value);
246248
return new PQCppObjectNoWrap(2);
247249
}
248250

@@ -429,13 +431,13 @@ public Q_SLOTS:
429431
void testNoArg() { _called = true; }
430432

431433
//! overload test!
432-
void overload(bool a) { _calledOverload = 0; _called = true; }
433-
void overload(float a) { _calledOverload = 1; _called = true;}
434-
void overload(int a) { _calledOverload = 2; _called = true;}
435-
void overload(const QString& str) { _calledOverload = 3; _called = true;}
436-
void overload(const QStringList& str) { _calledOverload = 4; _called = true;}
437-
void overload(QObject* str) { _calledOverload = 5; _called = true;}
438-
void overload(float a, int b) { _calledOverload = 6; _called = true;}
434+
void overload(bool a) { Q_UNUSED(a); _calledOverload = 0; _called = true; }
435+
void overload(float a) { Q_UNUSED(a); _calledOverload = 1; _called = true;}
436+
void overload(int a) { Q_UNUSED(a); _calledOverload = 2; _called = true;}
437+
void overload(const QString& str) { Q_UNUSED(str); _calledOverload = 3; _called = true;}
438+
void overload(const QStringList& str) { Q_UNUSED(str); _calledOverload = 4; _called = true;}
439+
void overload(QObject* str) { Q_UNUSED(str); _calledOverload = 5; _called = true;}
440+
void overload(float a, int b) { Q_UNUSED(a); Q_UNUSED(b);_calledOverload = 6; _called = true;}
439441

440442
//! POD values:
441443
int getInt(int a) { _called = true; return a; }

0 commit comments

Comments
 (0)