misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/kernel/qcoreapplication.h b/src/core/kernel/qcoreapplication.h
index 56b2b9f..2058958 100644 (file)
--- a/src/core/kernel/qcoreapplication.h
+++ b/src/core/kernel/qcoreapplication.h
@@ -76,9 +76,7 @@ class Q_CORE_EXPORT QCoreApplication : public QObject
 
     Q_DECLARE_PRIVATE(QCoreApplication)
 public:
-    enum { ApplicationFlags = QT_VERSION
-        | 0x01000000
-    };
+    enum { ApplicationFlags = QT_VERSION | 0x01000000 };
 
     QCoreApplication(int &argc, char **argv, int
 #if !defined(QT_BUILD_CORE_LIB)

diff --git a/src/core/kernel/qmetaobject.cpp b/src/core/kernel/qmetaobject.cpp
index dd1e410..c96d644 100644 (file)
--- a/src/core/kernel/qmetaobject.cpp
+++ b/src/core/kernel/qmetaobject.cpp
@@ -621,17 +621,16 @@ static const QMetaObject *QMetaObject_findMetaObject(const QMetaObject *self, co
         if (self->d.relatedMetaObjects) {
             Q_ASSERT(priv(self->d.data)->revision >= 6);
 #ifdef Q_NO_DATA_RELOCATION
-            const QMetaObjectAccessor *e;
+            const QMetaObjectAccessor *e = self->d.relatedMetaObjects;
 #else
-            const QMetaObject **e;
+            const QMetaObject **e = self->d.relatedMetaObjects;
 #endif
-            e = self->d.relatedMetaObjects;
             if (e) {
                 while (*e) {
 #ifdef Q_NO_DATA_RELOCATION
-                    if (const QMetaObject *m =QMetaObject_findMetaObject(&((*e)()), name))
+                    if (const QMetaObject *m = QMetaObject_findMetaObject(&((*e)()), name))
 #else
-                    if (const QMetaObject *m =QMetaObject_findMetaObject((*e), name))
+                    if (const QMetaObject *m = QMetaObject_findMetaObject((*e), name))
 #endif
                         return m;
                     ++e;