Telegram app

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

  1. fix_build_warnings
  2. Merge into telegram
Proposed by Devid Antonio Filoni
Status: Merged
Approved by: Jin
Approved revision: 242
Merged at revision: 239
Proposed branch: lp:~d.filoni/telegram-app/fix_build_warnings
Merge into: lp:telegram-app
Diff against target: 118 lines (+32/-31)
4 files modified
telegram/app/qml/components/ColoredImage.qml (+28/-28)
telegram/app/qml/js/ba-linkify.js (+1/-1)
telegram/app/upgradev2.cpp (+1/-1)
telegram/push/pushclient.h (+2/-1)
To merge this branch: bzr merge lp:~d.filoni/telegram-app/fix_build_warnings
Reviewer Review Type Date Requested Status
Jin (community) Approve
Review via email: mp+308185@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Jin (jindallo) wrote :

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

I will approve after verified pass.

Revision history for this message
Jin (jindallo) wrote :

Verified pass,
I approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
54 property color keyColorIn: "#ffffff"54 property color keyColorIn: "#ffffff"
55 property real threshold: 0.155 property real threshold: 0.1
5656
57 readonly property string mirroredShader: "57 readonly property string mirroredShader: " \
58 uniform highp mat4 qt_Matrix;58 uniform highp mat4 qt_Matrix; \
59 attribute highp vec4 qt_Vertex;59 attribute highp vec4 qt_Vertex; \
60 attribute highp vec2 qt_MultiTexCoord0;60 attribute highp vec2 qt_MultiTexCoord0; \
61 varying highp vec2 qt_TexCoord0;61 varying highp vec2 qt_TexCoord0; \
62 void main() {62 void main() { \
63 qt_TexCoord0 = vec2(1.0 - qt_MultiTexCoord0.s, qt_MultiTexCoord0.t);63 qt_TexCoord0 = vec2(1.0 - qt_MultiTexCoord0.s, qt_MultiTexCoord0.t); \
64 gl_Position = qt_Matrix * qt_Vertex;64 gl_Position = qt_Matrix * qt_Vertex; \
65 }"65 }"
6666
67 readonly property string originalShader: "67 readonly property string originalShader: " \
68 uniform highp mat4 qt_Matrix;68 uniform highp mat4 qt_Matrix; \
69 attribute highp vec4 qt_Vertex;69 attribute highp vec4 qt_Vertex; \
70 attribute highp vec2 qt_MultiTexCoord0;70 attribute highp vec2 qt_MultiTexCoord0; \
71 varying highp vec2 qt_TexCoord0;71 varying highp vec2 qt_TexCoord0; \
72 void main() {72 void main() { \
73 qt_TexCoord0 = qt_MultiTexCoord0;73 qt_TexCoord0 = qt_MultiTexCoord0; \
74 gl_Position = qt_Matrix * qt_Vertex;74 gl_Position = qt_Matrix * qt_Vertex; \
75 }"75 }"
7676
77 vertexShader: root.mirror ? mirroredShader : originalShader77 vertexShader: root.mirror ? mirroredShader : originalShader
7878
79 fragmentShader: "79 fragmentShader: " \
80 varying highp vec2 qt_TexCoord0;80 varying highp vec2 qt_TexCoord0; \
81 uniform sampler2D source;81 uniform sampler2D source; \
82 uniform highp vec4 keyColorOut;82 uniform highp vec4 keyColorOut; \
83 uniform highp vec4 keyColorIn;83 uniform highp vec4 keyColorIn; \
84 uniform lowp float threshold;84 uniform lowp float threshold; \
85 uniform lowp float qt_Opacity;85 uniform lowp float qt_Opacity; \
86 void main() {86 void main() { \
87 lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);87 lowp vec4 sourceColor = texture2D(source, qt_TexCoord0); \
88 gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a,88 gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, \
89 sourceColor,89 sourceColor, \
90 step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;90 step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity; \
91 }"91 }"
92 }92 }
93}93}
9494
=== 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 @@
98 callback: function( text, href ) {98 callback: function( text, href ) {
99 return href ? '<a href="' + href + '" title="' + href + '">' + text + '</a>' : text;99 return href ? '<a href="' + href + '" title="' + href + '">' + text + '</a>' : text;
100 },100 },
101 punct_regexp: /(?:[!?.,:;'"]|(?:&|&amp;)(?:lt|gt|quot|apos|raquo|laquo|rsaquo|lsaquo);)$/101 punct_regexp: new RegExp("(?:[!?.,:;'\"]|(?:&|&amp;)(?:lt|gt|quot|apos|raquo|laquo|rsaquo|lsaquo);)$")
102};102};
103103
104function linkify( txt, options ) {104function linkify( txt, options ) {
105105
=== 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 @@
113 */113 */
114}114}
115115
116inline void UpgradeV2::copySecretPhoto(qint64 peer, bool out, qint64 mediaId, QSqlDatabase &newDb) {116inline void UpgradeV2::copySecretPhoto(qint64 peer, bool /*out*/, qint64 mediaId, QSqlDatabase &newDb) {
117 QSqlQuery photo(db);117 QSqlQuery photo(db);
118 photo.prepare("SELECT caption, date, accessHash, userId FROM mediaPhotos WHERE id = :id");118 photo.prepare("SELECT caption, date, accessHash, userId FROM mediaPhotos WHERE id = :id");
119 photo.bindValue(":id", mediaId);119 photo.bindValue(":id", mediaId);
120120
=== 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 @@
34 void setAppId(const QString &appId);34 void setAppId(const QString &appId);
35 QString getToken();35 QString getToken();
36 QString getStatus() { return this->status; }36 QString getStatus() { return this->status; }
37 QStringList getNotifications() { return this->notifications; }
37 int getCount();38 int getCount();
38 void setCount(int count);39 void setCount(int count);
3940
@@ -41,7 +42,7 @@
4142
42 Q_PROPERTY(QString appId WRITE setAppId READ getAppId NOTIFY appIdChanged);43 Q_PROPERTY(QString appId WRITE setAppId READ getAppId NOTIFY appIdChanged);
43 Q_PROPERTY(QString token READ getToken NOTIFY tokenChanged);44 Q_PROPERTY(QString token READ getToken NOTIFY tokenChanged);
44 Q_PROPERTY(QStringList notifications NOTIFY notificationsChanged);45 Q_PROPERTY(QStringList notifications READ getNotifications NOTIFY notificationsChanged);
45 Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged);46 Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged);
46 Q_PROPERTY(int count READ getCount WRITE setCount NOTIFY countChanged)47 Q_PROPERTY(int count READ getCount WRITE setCount NOTIFY countChanged)
4748

Subscribers

People subscribed via source and target branches

to status/vote changes: