mark some helper functions as static and variables as const

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 00b332d..3c29d07 100644 (file)
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -51,7 +51,7 @@
 QT_BEGIN_NAMESPACE
 
 // must be kept in sync with the moc
-static int qmetaobjectrevision = 6;
+static const int qmetaobjectrevision = 6;
 
 class QDBusMetaObjectGenerator
 {

diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index 7685fe8..f53cfdc 100644 (file)
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 */
 
 // copied from moc's generator.cpp
-uint qvariant_nameToType(const char* name)
+static uint qvariant_nameToType(const char* name)
 {
     if (!name)
         return 0;
@@ -83,7 +83,7 @@ uint qvariant_nameToType(const char* name)
 /*
   Returns true if the type is a QVariant types.
 */
-bool isVariantType(const char* type)
+static bool isVariantType(const char* type)
 {
     return qvariant_nameToType(type) != 0;
 }
@@ -94,8 +94,8 @@ inline const QMetaObjectPrivate *priv(const uint* data)
 
 // must be kept in sync with the moc
 // Number of fields in the QMetaObjectPrivate.
-const static int qmetaobjectindex = 14;
-const static int qmetaobjectrevision = 6;
+static const int qmetaobjectindex = 14;
+static const int qmetaobjectrevision = 6;
 
 class QMetaMethodBuilderPrivate
 {

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 00f013f..27c8dc1 100644 (file)
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-uint qvariant_nameToType(const char* name)
+static uint qvariant_nameToType(const char* name)
 {
     if (!name)
         return 0;
@@ -55,7 +55,7 @@ uint qvariant_nameToType(const char* name)
 /*
   Returns true if the type is a QVariant types.
 */
-bool isVariantType(const char* type)
+static bool isVariantType(const char* type)
 {
     return qvariant_nameToType(type) != 0;
 }