Merge lp:~d.filoni/telegram-app/fix_build_warnings into lp:telegram-app

[Devid Antonio Filoni]

Proposed branch fixes following build warnings (xenial desktop).

Commit #239:
telegram/app/qml/js/ba-linkify.js:101: warning: unterminated character constant
(bug #1376153)

Commit #240:
telegram/app/qml/components/ColoredImage.qml:57: warning: unterminated string literal
telegram/app/qml/components/ColoredImage.qml:65: warning: unterminated string literal
telegram/app/qml/components/ColoredImage.qml:67: warning: unterminated string literal
telegram/app/qml/components/ColoredImage.qml:75: warning: unterminated string literal
telegram/app/qml/components/ColoredImage.qml:79: warning: unterminated string literal
telegram/app/qml/components/ColoredImage.qml:91: warning: unterminated string literal

Commit #241:
../../app/upgradev2.cpp:116:58: warning: unused parameter ‘out’ [-Wunused-parameter]
 inline void UpgradeV2::copySecretPhoto(qint64 peer, bool out, qint64 mediaId, QSqlDatabase &newDb) {

Commit #242:
../../push/pushclient.h:44: Warning: Property declaration notifications has no READ accessor function or associated MEMBER variable. The property will be invalid.

[Jin (jindallo)]

Thanks for providing this patch,
symptoms: 4 warning traces are confirmed,
and the codes look good.

I will approve after verified pass.

[Jin (jindallo)]

Verified pass,
I approve.

review: Approve

=== modified file 'telegram/app/qml/components/ColoredImage.qml'
--- telegram/app/qml/components/ColoredImage.qml	2015-09-22 09:57:07 +0000
+++ telegram/app/qml/components/ColoredImage.qml	2016-10-11 19:31:28 +0000
@@ -54,40 +54,40 @@
         property color keyColorIn: "#ffffff"
         property real threshold: 0.1
 
-        readonly property string mirroredShader: "
-            uniform highp mat4 qt_Matrix;
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec2 qt_MultiTexCoord0;
-            varying highp vec2 qt_TexCoord0;
-            void main() {
-                qt_TexCoord0 = vec2(1.0 - qt_MultiTexCoord0.s, qt_MultiTexCoord0.t);
-                gl_Position = qt_Matrix * qt_Vertex;
+        readonly property string mirroredShader: " \
+            uniform highp mat4 qt_Matrix; \
+            attribute highp vec4 qt_Vertex; \
+            attribute highp vec2 qt_MultiTexCoord0; \
+            varying highp vec2 qt_TexCoord0; \
+            void main() { \
+                qt_TexCoord0 = vec2(1.0 - qt_MultiTexCoord0.s, qt_MultiTexCoord0.t); \
+                gl_Position = qt_Matrix * qt_Vertex; \
             }"
 
-        readonly property string originalShader: "
-            uniform highp mat4 qt_Matrix;
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec2 qt_MultiTexCoord0;
-            varying highp vec2 qt_TexCoord0;
-            void main() {
-                qt_TexCoord0 = qt_MultiTexCoord0;
-                gl_Position = qt_Matrix * qt_Vertex;
+        readonly property string originalShader: " \
+            uniform highp mat4 qt_Matrix; \
+            attribute highp vec4 qt_Vertex; \
+            attribute highp vec2 qt_MultiTexCoord0; \
+            varying highp vec2 qt_TexCoord0; \
+            void main() { \
+                qt_TexCoord0 = qt_MultiTexCoord0; \
+                gl_Position = qt_Matrix * qt_Vertex; \
             }"
 
         vertexShader: root.mirror ? mirroredShader : originalShader
 
-        fragmentShader: "
-            varying highp vec2 qt_TexCoord0;
-            uniform sampler2D source;
-            uniform highp vec4 keyColorOut;
-            uniform highp vec4 keyColorIn;
-            uniform lowp float threshold;
-            uniform lowp float qt_Opacity;
-            void main() {
-                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
-                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a,
-                               sourceColor,
-                               step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
+        fragmentShader: " \
+            varying highp vec2 qt_TexCoord0; \
+            uniform sampler2D source; \
+            uniform highp vec4 keyColorOut; \
+            uniform highp vec4 keyColorIn; \
+            uniform lowp float threshold; \
+            uniform lowp float qt_Opacity; \
+            void main() { \
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0); \
+                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, \
+                               sourceColor, \
+                               step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity; \
             }"
     }
 }

=== modified file 'telegram/app/qml/js/ba-linkify.js'
--- telegram/app/qml/js/ba-linkify.js	2016-03-30 16:11:57 +0000
+++ telegram/app/qml/js/ba-linkify.js	2016-10-11 19:31:28 +0000
@@ -98,7 +98,7 @@
   callback: function( text, href ) {
     return href ? '<a href="' + href + '" title="' + href + '">' + text + '</a>' : text;
   },
-  punct_regexp: /(?:[!?.,:;'"]|(?:&|&amp;)(?:lt|gt|quot|apos|raquo|laquo|rsaquo|lsaquo);)$/
+  punct_regexp: new RegExp("(?:[!?.,:;'\"]|(?:&|&amp;)(?:lt|gt|quot|apos|raquo|laquo|rsaquo|lsaquo);)$")
 };
 
 function linkify( txt, options ) {

=== modified file 'telegram/app/upgradev2.cpp'
--- telegram/app/upgradev2.cpp	2016-01-19 14:21:34 +0000
+++ telegram/app/upgradev2.cpp	2016-10-11 19:31:28 +0000
@@ -113,7 +113,7 @@
     */
 }
 
-inline void UpgradeV2::copySecretPhoto(qint64 peer, bool out, qint64 mediaId, QSqlDatabase &newDb) {
+inline void UpgradeV2::copySecretPhoto(qint64 peer, bool /*out*/, qint64 mediaId, QSqlDatabase &newDb) {
     QSqlQuery photo(db);
     photo.prepare("SELECT caption, date, accessHash, userId FROM mediaPhotos WHERE id = :id");
     photo.bindValue(":id", mediaId);

=== modified file 'telegram/push/pushclient.h'
--- telegram/push/pushclient.h	2015-09-22 09:57:07 +0000
+++ telegram/push/pushclient.h	2016-10-11 19:31:28 +0000
@@ -34,6 +34,7 @@
     void setAppId(const QString &appId);
     QString getToken();
     QString getStatus() { return this->status; }
+    QStringList getNotifications() { return this->notifications; }
     int getCount();
     void setCount(int count);
 
@@ -41,7 +42,7 @@
 
     Q_PROPERTY(QString appId WRITE setAppId READ getAppId NOTIFY appIdChanged);
     Q_PROPERTY(QString token READ getToken NOTIFY tokenChanged);
-    Q_PROPERTY(QStringList notifications NOTIFY notificationsChanged);
+    Q_PROPERTY(QStringList notifications READ getNotifications NOTIFY notificationsChanged);
     Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged);
     Q_PROPERTY(int count READ getCount WRITE setCount NOTIFY countChanged)