Merge lp:~fboucault/ubuntu-ui-toolkit/support_quotes_in_sci into lp:ubuntu-ui-toolkit

[Florian Boucault]

Support source with quotes in .sci files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/31

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/31/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Looks fine, and maintains backward compatibility. Though I question if we should be more strict and poke people to update their .sci files?

One question: why escape the double quote character to get the char? I expected '"' to just work.

[lp:~fboucault/ubuntu-ui-toolkit/support_quotes_in_sci]

480. By Florian Boucault on 2013-05-07

No need to escape "

[Florian Boucault (fboucault)]

> Looks fine, and maintains backward compatibility. Though I question if we
> should be more strict and poke people to update their .sci files?
>
> One question: why escape the double quote character to get the char? I
> expected '"' to just work.

Better safe than sorry was the reasoning but you are right, removed escaping.

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
--- modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2012-11-30 17:46:02 +0000
+++ modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2013-05-07 11:23:28 +0000
@@ -147,5 +147,17 @@
     // Rewrite the source line by prepending "image://scaling" to the source value
     QString sciDirectory = QFileInfo(sciFilePath).dir().path() + QDir::separator();
     QString baseUrl = "image://scaling/" + scaleFactor + "/" + sciDirectory;
-    return source.replace("source: ", "source: " + baseUrl);
+
+    // If the source url is between quotes "", remove them
+    const QChar quote = '"';
+    const int quoteFirstIndex = source.indexOf(quote);
+    if (quoteFirstIndex != -1) {
+        source.remove(quoteFirstIndex, 1);
+    }
+    const int quoteLastIndex = source.lastIndexOf(quote);
+    if (quoteLastIndex != -1) {
+        source.remove(quoteLastIndex, 1);
+    }
+
+    return source.replace("source: ", "source: " + QString(quote) + baseUrl).append(quote);
 }

=== modified file 'tests/unit/tst_qquick_image_extension/borderInName.sci'
--- tests/unit/tst_qquick_image_extension/borderInName.sci	2012-11-19 14:52:16 +0000
+++ tests/unit/tst_qquick_image_extension/borderInName.sci	2013-05-07 11:23:28 +0000
@@ -1,4 +1,4 @@
-source: borderInName.png
+source: "borderInName.png"
 border.left: 9
 border.right: 2
 border.top: 9 

=== modified file 'tests/unit/tst_qquick_image_extension/[e-mail]'
--- tests/unit/tst_qquick_image_extension/[e-mail]	2012-11-30 17:05:38 +0000
+++ tests/unit/tst_qquick_image_extension/[e-mail]	2013-05-07 11:23:28 +0000
@@ -1,4 +1,4 @@
-source: [e-mail]
+source: "[e-mail]"
 border.left: 9
 border.right: 2
 border.top: 9 

=== modified file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp'
--- tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2012-11-30 17:10:42 +0000
+++ tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2013-05-07 11:23:28 +0000
@@ -70,7 +70,7 @@
 
         QString expected;
         QTextStream expectedStream(&expected);
-        expectedStream << "source: image://scaling/1/./borderInName.png" << endl;
+        expectedStream << "source: \"image://scaling/1/./borderInName.png\"" << endl;
         expectedStream << "border.left: 9" << endl;
         expectedStream << "border.right: 2" << endl;
         expectedStream << "border.top: 9" << endl;