Reduce number of relocations

...by turning pointer into array variables.

Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 5ec9e5f..a2de776 100644 (file)
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -76,7 +76,7 @@ static bool isLocaleObject(v8::Handle<v8::Value> val)
 //--------------
 // Date extension
 
-static const char *dateToLocaleStringFunction =
+static const char dateToLocaleStringFunction[] =
         "(function(toLocaleStringFunc) { "
         "  var orig_toLocaleString;"
         "  orig_toLocaleString = Date.prototype.toLocaleString;"
@@ -87,7 +87,7 @@ static const char *dateToLocaleStringFunction =
         "  })"
         "})";
 
-static const char *dateToLocaleTimeStringFunction =
+static const char dateToLocaleTimeStringFunction[] =
         "(function(toLocaleTimeStringFunc) { "
         "  var orig_toLocaleTimeString;"
         "  orig_toLocaleTimeString = Date.prototype.toLocaleTimeString;"
@@ -98,7 +98,7 @@ static const char *dateToLocaleTimeStringFunction =
         "  })"
         "})";
 
-static const char *dateToLocaleDateStringFunction =
+static const char dateToLocaleDateStringFunction[] =
         "(function(toLocaleDateStringFunc) { "
         "  var orig_toLocaleDateString;"
         "  orig_toLocaleDateString = Date.prototype.toLocaleDateString;"
@@ -110,28 +110,28 @@ static const char *dateToLocaleDateStringFunction =
         "})";
 
 
-static const char *dateFromLocaleStringFunction =
+static const char dateFromLocaleStringFunction[] =
         "(function(fromLocaleStringFunc) { "
         "  Date.fromLocaleString = (function() {"
         "    return fromLocaleStringFunc.apply(null, arguments);"
         "  })"
         "})";
 
-static const char *dateFromLocaleTimeStringFunction =
+static const char dateFromLocaleTimeStringFunction[] =
         "(function(fromLocaleTimeStringFunc) { "
         "  Date.fromLocaleTimeString = (function() {"
         "    return fromLocaleTimeStringFunc.apply(null, arguments);"
         "  })"
         "})";
 
-static const char *dateFromLocaleDateStringFunction =
+static const char dateFromLocaleDateStringFunction[] =
         "(function(fromLocaleDateStringFunc) { "
         "  Date.fromLocaleDateString = (function() {"
         "    return fromLocaleDateStringFunc.apply(null, arguments);"
         "  })"
         "})";
 
-static const char *dateTimeZoneUpdatedFunction =
+static const char dateTimeZoneUpdatedFunction[] =
         "(function(timeZoneUpdatedFunc) { "
         "  Date.timeZoneUpdated = (function() {"
         "    return timeZoneUpdatedFunc.apply(null, arguments);"
@@ -408,7 +408,7 @@ v8::Handle<v8::Value> QQmlDateExtension::timeZoneUpdated(const v8::Arguments& ar
 //-----------------
 // Number extension
 
-static const char *numberToLocaleStringFunction =
+static const char numberToLocaleStringFunction[] =
         "(function(toLocaleStringFunc) { "
         "  var orig_toLocaleString;"
         "  orig_toLocaleString = Number.prototype.toLocaleString;"
@@ -419,14 +419,14 @@ static const char *numberToLocaleStringFunction =
         "  })"
         "})";
 
-static const char *numberToLocaleCurrencyStringFunction =
+static const char numberToLocaleCurrencyStringFunction[] =
         "(function(toLocaleCurrencyStringFunc) { "
         "  Number.prototype.toLocaleCurrencyString = (function() {"
         "    return toLocaleCurrencyStringFunc.apply(this, arguments);"
         "  })"
         "})";
 
-static const char *numberFromLocaleStringFunction =
+static const char numberFromLocaleStringFunction[] =
         "(function(fromLocaleStringFunc) { "
         "  Number.fromLocaleString = (function() {"
         "    return fromLocaleStringFunc.apply(null, arguments);"
@@ -879,7 +879,7 @@ v8::Handle<v8::Value> QQmlLocale::locale(QV8Engine *v8engine, const QString &loc
     return v8Value;
 }
 
-static const char *localeCompareFunction =
+static const char localeCompareFunction[] =
     "(function(localeCompareFunc) { "
     "  var orig_localeCompare;"
     "  orig_localeCompare = String.prototype.localeCompare;"

diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 7d7955c..622000e 100644 (file)
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -273,11 +273,11 @@ void QQuickCustomMaterialShader::compile()
         m_log += program()->log();
     }
 
-    static const char *fallbackVertexShader =
+    static const char fallbackVertexShader[] =
             "uniform highp mat4 qt_Matrix;"
             "attribute highp vec4 v;"
             "void main() { gl_Position = qt_Matrix * v; }";
-    static const char *fallbackFragmentShader =
+    static const char fallbackFragmentShader[] =
             "void main() { gl_FragColor = vec4(1., 0., 1., 1.); }";
 
     if (!m_compiled) {

diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
index 393f0c7..40ff6a6 100644 (file)
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
@@ -463,7 +463,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width,
     glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
 
     {
-        static const char *vertexShaderSource =
+        static const char vertexShaderSource[] =
                 "attribute highp   vec4      vertexCoordsArray; \n"
                 "attribute highp   vec2      textureCoordArray; \n"
                 "varying   highp   vec2      textureCoords;     \n"
@@ -473,7 +473,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width,
                 "    textureCoords = textureCoordArray; \n"
                 "} \n";
 
-        static const char *fragmentShaderSource =
+        static const char fragmentShaderSource[] =
                 "varying   highp   vec2      textureCoords; \n"
                 "uniform   sampler2D         texture;       \n"
                 "void main() \n"