Fix some minor warnings

* move variable into sub scope
* avoid using a expression repeatedly
* global variable shadows local variable
* testing against null is superfluous without std::nothrow

Change-Id: I86a3388fa46b8847a7604d8362dd08784b5f1e9f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>

3 files changed, 26 insertions, 25 deletions

diff --git a/src/knx/knxproj/qzip.cpp b/src/knx/knxproj/qzip.cpp
index 0c84c95..bab9178 100644
--- a/src/knx/knxproj/qzip.cpp
+++ b/src/knx/knxproj/qzip.cpp
@@ -102,18 +102,20 @@ static inline void copyUShort(uchar *dest, const uchar *src)
 static void writeMSDosDate(uchar *dest, const QDateTime& dt)
 {
     if (dt.isValid()) {
+        const auto dtTime = dt.time();
         quint16 time =
-            (dt.time().hour() << 11)    // 5 bit hour
-            | (dt.time().minute() << 5)   // 6 bit minute
-            | (dt.time().second() >> 1);  // 5 bit double seconds
+            (dtTime.hour() << 11)    // 5 bit hour
+            | (dtTime.minute() << 5)   // 6 bit minute
+            | (dtTime.second() >> 1);  // 5 bit double seconds
 
         dest[0] = time & 0xff;
         dest[1] = time >> 8;
 
+        const auto dtData = dt.date();
         quint16 date =
-            ((dt.date().year() - 1980) << 9) // 7 bit year 1980-based
-            | (dt.date().month() << 5)           // 4 bit month
-            | (dt.date().day());                 // 5 bit day
+            ((dtData.year() - 1980) << 9) // 7 bit year 1980-based
+            | (dtData.month() << 5)           // 4 bit month
+            | (dtData.day());                 // 5 bit day
 
         dest[2] = char(date);
         dest[3] = char(date >> 8);
@@ -1034,11 +1036,11 @@ bool QZipReader::extractAll(const QString &destinationDir) const
 
     // set up symlinks
     for (const FileInfo &fi : allFiles) {
-        const QString absPath = destinationDir + QDir::separator() + fi.filePath;
         if (fi.isSymLink) {
             QString destination = QFile::decodeName(fileData(fi.filePath));
             if (destination.isEmpty())
                 return false;
+            const QString absPath = destinationDir + QDir::separator() + fi.filePath;
             QFileInfo linkFi(absPath);
             if (!QFile::exists(linkFi.absolutePath()))
                 QDir::root().mkpath(linkFi.absolutePath());
@@ -1052,8 +1054,8 @@ bool QZipReader::extractAll(const QString &destinationDir) const
     }
 
     for (const FileInfo &fi : allFiles) {
-        const QString absPath = destinationDir + QDir::separator() + fi.filePath;
         if (fi.isFile) {
+            const QString absPath = destinationDir + QDir::separator() + fi.filePath;
             QFile f(absPath);
             if (!f.open(QIODevice::WriteOnly))
                 return false;
diff --git a/src/knx/netip/qknxnetiprouter_p.cpp b/src/knx/netip/qknxnetiprouter_p.cpp
index 2b100ee..61b588a 100644
--- a/src/knx/netip/qknxnetiprouter_p.cpp
+++ b/src/knx/netip/qknxnetiprouter_p.cpp
@@ -77,9 +77,10 @@ void QKnxNetIpRouterPrivate::start()
         // Choose first interface available and capable of multicasting
         const auto interfaces = QNetworkInterface::allInterfaces();
         for (const auto &iface : interfaces) {
-            if (iface.flags().testFlag(QNetworkInterface::IsRunning)
-                && iface.flags().testFlag(QNetworkInterface::CanMulticast)
-                && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
+            const auto flags = iface.flags();
+            if (flags.testFlag(QNetworkInterface::IsRunning)
+                && flags.testFlag(QNetworkInterface::CanMulticast)
+                && !flags.testFlag(QNetworkInterface::IsLoopBack)) {
                 m_iface = iface;
                 break;
             }
diff --git a/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp b/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp
index 0f3b926..ae435a2 100644
--- a/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp
+++ b/tests/auto/qknxnetiprouter/tst_qknxnetiprouter.cpp
@@ -177,22 +177,22 @@ void tst_QKnxNetIpRouter::test_multicast_address()
 
     {
         // default multicast address
-        QKnxNetIpRouter m_router;
-        QCOMPARE(m_router.multicastAddress(), kMulticastAddress);
+        QKnxNetIpRouter router;
+        QCOMPARE(router.multicastAddress(), kMulticastAddress);
     }
     {
         // setting an invalid multicast address shouldn't work
-        QKnxNetIpRouter m_router;
-        auto kMulticastAddress = QHostAddress(QHostAddress::LocalHost);
-        m_router.setMulticastAddress(kMulticastAddress);
-        QVERIFY(m_router.multicastAddress() != kMulticastAddress);
+        QKnxNetIpRouter router;
+        auto multicastAddress = QHostAddress(QHostAddress::LocalHost);
+        router.setMulticastAddress(kMulticastAddress);
+        QVERIFY(router.multicastAddress() != multicastAddress);
     }
     {
         // setting a valid multicast address
-        QKnxNetIpRouter m_router;
+        QKnxNetIpRouter router;
         auto address = QHostAddress("224.0.55.55");
-        m_router.setMulticastAddress(address);
-        QCOMPARE(m_router.multicastAddress(), address);
+        router.setMulticastAddress(address);
+        QCOMPARE(router.multicastAddress(), address);
     }
 }
 
@@ -234,7 +234,7 @@ void tst_QKnxNetIpRouter::simulateFramesReceived(const QKnxNetIpFrame &netIpFram
     if (!runTests)
         return;
 
-    QUdpSocket * s = new QUdpSocket();
+    QUdpSocket *s = new QUdpSocket();
 
     s->bind(QHostAddress(QHostAddress::AnyIPv4), 0);
     s->setMulticastInterface(kIface);
@@ -248,10 +248,8 @@ void tst_QKnxNetIpRouter::simulateFramesReceived(const QKnxNetIpFrame &netIpFram
     // notify router socket to wait for any received packet
     QKnxNetIpTestRouter::instance()->emitReadyRead();
 
-    if (s) {
-        s->disconnect();
-        s->deleteLater();
-    }
+    s->disconnect();
+    s->deleteLater();
 }
 
 void tst_QKnxNetIpRouter::test_routing()