Fix unused variable warning in PythonQtSlot

Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>
commontk · May 10, 2015 · 990cfab · 990cfab
1 parent 49c5b5b
commit 990cfab
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/src/PythonQtSlot.cpp b/src/PythonQtSlot.cpp
@@ -84,15 +84,13 @@ bool PythonQtCallSlot(PythonQtClassInfo* classInfo, QObject* objectToCall, PyObj
   argList[0] = NULL;
 
   bool ok = true;
-  bool skipFirst = false;
   PythonQtPassThisOwnershipType passThisOwnership = IgnoreOwnership;
 
   int instanceDecoOffset = 0;
   // it is important to keep arg1 on this scope, because it is stored in argList[1] and
   // would go away if it is moved into the if scope
   void* arg1 = NULL;
   if (info->isInstanceDecorator()) {
-    skipFirst = true;
     instanceDecoOffset = 1;
 
     // for decorators on CPP objects, we take the cpp ptr, for QObjects we take the QObject pointer

diff --git a/src/PythonQtStdIn.cpp b/src/PythonQtStdIn.cpp
@@ -53,6 +53,7 @@ static PyObject *PythonQtStdInRedirect_new(PyTypeObject *type, PyObject * /*args
 
 static PyObject *PythonQtStdInRedirect_readline(PyObject * self, PyObject * args)
 {
+  Q_UNUSED(args);
   PythonQtStdInRedirect*  s = (PythonQtStdInRedirect*)self;
   QString string;
   if (s->_cb) {

diff --git a/tests/PythonQtTests.cpp b/tests/PythonQtTests.cpp
@@ -314,36 +314,46 @@ void PythonQtTestSlotCalling::testCppFactory()
 // PQCppObject2Decorator
 
 PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag1(PQCppObject2* obj, PQCppObject2Decorator::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
 PQCppObject2::TestEnumFlag PQCppObject2Decorator::testEnumFlag2(PQCppObject2* obj, PQCppObject2::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
 // with int overload
 PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag3(PQCppObject2* obj, int flag) {
+  Q_UNUSED(obj);
+  Q_UNUSED(flag);
   return (TestEnumFlag)-1;
 }
 PQCppObject2Decorator::TestEnumFlag PQCppObject2Decorator::testEnumFlag3(PQCppObject2* obj, PQCppObject2Decorator::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
 // PQCppObjectQFlagOnlyDecorator
 
 PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag1(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
 PQCppObjectQFlagOnly::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag2(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnly::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
 // with int overload
 PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, int flag) {
+  Q_UNUSED(obj);
+  Q_UNUSED(flag);
   return (TestEnumFlag)-1;
 }
 PQCppObjectQFlagOnlyDecorator::TestEnumFlag PQCppObjectQFlagOnlyDecorator::testEnumFlag3(PQCppObjectQFlagOnly* obj, PQCppObjectQFlagOnlyDecorator::TestEnumFlag flag) {
+  Q_UNUSED(obj);
   return flag;
 }
 
@@ -616,23 +626,27 @@ void PythonQtTestApi::testQColorDecorators()
 
 QByteArray PythonQtTestApiHelper::readFileAsBytes(const QString& filename)
 {
+  Q_UNUSED(filename);
   QByteArray b;
   return b;
 }
 
 QByteArray PythonQtTestApiHelper::readSourceFile(const QString& filename, bool& ok)
 {
+  Q_UNUSED(filename);
   QByteArray b;
   ok = true;
   return b;
 }
 
 bool PythonQtTestApiHelper::exists(const QString& filename)
 {
+  Q_UNUSED(filename);
   return true;
 }
 
 QDateTime PythonQtTestApiHelper::lastModifiedDate(const QString& filename) {
+  Q_UNUSED(filename);
   return QDateTime::currentDateTime();
 }
 
@@ -656,6 +670,7 @@ void PythonQtTestApiHelper::stdErr(const QString& s)
 
 QObject* PythonQtTestCppFactory::create(const QByteArray& name, void *ptr)
 {
+  Q_UNUSED(name);
   if (name == "PQCppObject") {
     return new PQCppObjectWrapper(ptr);
   }

diff --git a/tests/PythonQtTests.h b/tests/PythonQtTests.h
@@ -240,9 +240,11 @@ public Q_SLOTS:
     return new PQCppObjectNoWrap(0);
   }
   PQCppObjectNoWrap* new_PQCppObjectNoWrap(const PQCppObjectNoWrap& other) {
+    Q_UNUSED(other);
     return new PQCppObjectNoWrap(1);
   }
   PQCppObjectNoWrap* new_PQCppObjectNoWrap(double value) {
+    Q_UNUSED(value);
     return new PQCppObjectNoWrap(2);
   }
 
@@ -429,13 +431,13 @@ public Q_SLOTS:
   void testNoArg() { _called = true; }
 
   //! overload test!
-  void overload(bool a) { _calledOverload = 0; _called = true; }
-  void overload(float a) { _calledOverload = 1; _called = true;}
-  void overload(int a) { _calledOverload = 2; _called = true;}
-  void overload(const QString& str) { _calledOverload = 3; _called = true;}
-  void overload(const QStringList& str) { _calledOverload = 4; _called = true;}
-  void overload(QObject* str) { _calledOverload = 5; _called = true;}
-  void overload(float a, int b) { _calledOverload = 6; _called = true;}
+  void overload(bool a) { Q_UNUSED(a); _calledOverload = 0; _called = true; }
+  void overload(float a) { Q_UNUSED(a); _calledOverload = 1; _called = true;}
+  void overload(int a) { Q_UNUSED(a); _calledOverload = 2; _called = true;}
+  void overload(const QString& str) { Q_UNUSED(str); _calledOverload = 3; _called = true;}
+  void overload(const QStringList& str) { Q_UNUSED(str); _calledOverload = 4; _called = true;}
+  void overload(QObject* str) { Q_UNUSED(str); _calledOverload = 5; _called = true;}
+  void overload(float a, int b) { Q_UNUSED(a); Q_UNUSED(b);_calledOverload = 6; _called = true;}
 
   //! POD values:
   int getInt(int a) {   _called = true; return a; }