Fix coding style in android platform and style plugins

Change-Id: Ic0a1150178c571ea0c20a045ad7520d23d6d878c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

src/plugins/platforms/android/androidcontentfileengine.cpp

@@ -76,9 +76,8 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
         QJniObject::fromString(fileName(DefaultName)).object(),
         QJniObject::fromString(openModeStr).object());
 
-    if (fd < 0) {
+    if (fd < 0)
         return false;
-    }
 
     return QFSFileEngine::open(openMode, fd, QFile::AutoCloseHandle);
 }

src/plugins/platforms/android/qandroidplatformintegration.cpp

@@ -109,14 +109,14 @@ void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteA
     if (resource == "AndroidStandardPalette") {
         if (m_androidStyle)
             return &m_androidStyle->m_standardPalette;
-        else
-            return nullptr;
+
+        return nullptr;
     }
     if (resource == "AndroidQWidgetFonts") {
         if (m_androidStyle)
             return &m_androidStyle->m_QWidgetsFonts;
-        else
-            return nullptr;
+
+        return nullptr;
     }
     if (resource == "AndroidDeviceName") {
         static QString deviceName = QtAndroid::deviceName();

src/plugins/platforms/android/qandroidplatformopenglwindow.cpp

@@ -191,8 +191,8 @@ QSurfaceFormat QAndroidPlatformOpenGLWindow::format() const
 {
     if (m_nativeWindow == 0)
         return window()->requestedFormat();
-    else
-        return m_format;
+
+    return m_format;
 }
 
 void QAndroidPlatformOpenGLWindow::clearEgl()

src/plugins/styles/android/qandroidstyle.cpp

@@ -1352,9 +1352,10 @@ void QAndroidStyle::AndroidLayerDrawable::draw(QPainter *painter, const QStyleOp
 
 QAndroidStyle::AndroidDrawable *QAndroidStyle::AndroidLayerDrawable::layer(int id) const
 {
-    for (const LayerType &layer : m_layers)
+    for (const LayerType &layer : m_layers) {
         if (layer.first == id)
             return layer.second;
+    }
     return 0;
 }