Merge lp:~carlos-mazieri/ubuntu-filemanager-app/app-removed-code-about-old-properties into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

removed code related to old properties that do not exist anymore

removed code related to old properties that do not exist anymore

[Michael Spencer (ibelieve)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/12/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/12

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/50/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1159
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/50

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/50/rebuild

review: Approve (continuous-integration)

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-09-28 18:48:28 +0000
+++ FolderListPage.qml	2013-10-10 22:45:36 +0000
@@ -88,45 +88,19 @@
         pageModel.refresh()
     }
 
-    // For these 3 functions: pathAccessedDate(), pathModifiedDate() and pathModifiedDate()
-    // we are using a temporary construction to ask if a such property exists in the model
-    //
-    // Right now all properties exist: "pathAccessedDate", "pathModifiedDate" and "pathIsWritable"
-    // but they will be removed and the corresponding READ functions: pathAccessedDate(),
-    // pathModifiedDate() and pathIsWritable() will become Q_INVOKABLE() replacing the prefix "path" for
-    // "curPath".
-    // This construction will allow the File Manager to keep working while we change the model
-    // after changing the model, this construction can be removed
-
     function pathAccessedDate() {
-        if ("pathAccessedDate" in pageModel) {
-            console.log("using property pathAccessedDate")
-            return pageModel.pathAccessedDate
-        }
-        else {
-            console.log("calling method pageModel.curPathAccessedDate()")
-            return pageModel.curPathAccessedDate()
-        }
+        console.log("calling method pageModel.curPathAccessedDate()")
+        return pageModel.curPathAccessedDate()
     }
+
     function pathModifiedDate() {
-        if ("pathModifiedDate" in pageModel) {
-            console.log("using property pathModifiedDate")
-            return pageModel.pathModifiedDate
-        }
-        else {
-            console.log("calling method pageModel.curPathModifiedDate()")
-            return pageModel.curPathModifiedDate()
-        }
+        console.log("calling method pageModel.curPathModifiedDate()")
+        return pageModel.curPathModifiedDate()
     }
+
     function pathIsWritable() {
-        if ("pathIsWritable" in pageModel) {
-            console.log("using property pathIsWritable");
-            return pageModel.pathIsWritable
-        }
-        else {
-            console.log("calling method pageModel.curPathIsWritable()")
-            return pageModel.curPathIsWritable()
-        }
+        console.log("calling method pageModel.curPathIsWritable()")
+        return pageModel.curPathIsWritable()
     }
 
     // FIXME: hard coded path for icon, assumes Ubuntu desktop icon available.