diff --git a/harbour-tooter.desktop b/harbour-tooter.desktop index f3bdd0e..1ebb61c 100644 --- a/harbour-tooter.desktop +++ b/harbour-tooter.desktop @@ -3,10 +3,10 @@ Type=Application X-Nemo-Application-Type=silica-qt5 Icon=harbour-tooter Exec=harbour-tooter -Name=harbour-tooter +Name=Tooter # translation example: # your app name in German locale (de) # # Remember to comment out the following line, if you do not want to use # a different app name in German locale (de). -Name[de]=harbour-tooter + diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 6a94e7f..d1e00be 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -21,7 +21,6 @@ OTHER_FILES += qml/harbour-tooter.qml \ qml/pages/MainPage.qml \ qml/pages/LoginPage.qml \ qml/pages/components/MyList.qml \ - qml/pages/components/JSONListModel.qml \ qml/pages/components/Navigation.qml \ rpm/harbour-tooter.changes.in \ rpm/harbour-tooter.spec \ @@ -43,7 +42,6 @@ TRANSLATIONS += translations/harbour-tooter-de.ts DISTFILES += \ qml/lib/API.js \ - qml/lib/jsonpath.js \ qml/images/notification.svg \ qml/images/home.svg \ qml/images/mesagess.svg \ diff --git a/harbour-tooter.pro.user b/harbour-tooter.pro.user index 709aa49..39ab40e 100644 --- a/harbour-tooter.pro.user +++ b/harbour-tooter.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {41ec03ca-9430-48f3-b421-990d428b2838} + {25497605-1bff-4134-a878-76c1475dd8e3} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -61,12 +61,12 @@ MerSDK-SailfishOS-i486 MerSDK-SailfishOS-i486 - {fd18ca89-dfc9-4054-9c53-c67be7689951} + {f49c1b5a-d715-401a-9a10-0e5fe9e5b72a} 0 2 0 - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug true @@ -138,7 +138,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Release + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Release true @@ -210,7 +210,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile true @@ -396,7 +396,7 @@ 13 14 - /Users/dysko/GIT/harbour-tooter + C:/Users/dysko/SF/harbour-tooter false 10234 3 @@ -426,12 +426,12 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl - {f895389d-b51a-4d4f-8b03-5ec64bda6f66} + {588087e2-ecc1-41aa-b652-86f16cba9351} 0 2 0 - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug true @@ -503,7 +503,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release true @@ -575,7 +575,7 @@ true - /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile + C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile true @@ -761,7 +761,7 @@ 13 14 - /Users/dysko/GIT/harbour-tooter + C:/Users/dysko/SF/harbour-tooter false 10234 3 @@ -779,7 +779,7 @@ 3768 false true - true + false false true diff --git a/qml/lib/jsonpath.js b/qml/lib/jsonpath.js deleted file mode 100644 index 8107803..0000000 --- a/qml/lib/jsonpath.js +++ /dev/null @@ -1,88 +0,0 @@ -/* JSONPath 0.8.5 - XPath for JSON - * - * Copyright (c) 2007 Stefan Goessner (goessner.net) - * Licensed under the MIT (MIT-LICENSE.txt) licence. - * - */ -function jsonPath(obj, expr, arg) { - var P = { - resultType: arg && arg.resultType || "VALUE", - result: [], - normalize: function(expr) { - var subx = []; - return expr.replace(/[\['](\??\(.*?\))[\]']|\['(.*?)'\]/g, function($0,$1,$2){return "[#"+(subx.push($1||$2)-1)+"]";}) /* http://code.google.com/p/jsonpath/issues/detail?id=4 */ - .replace(/'?\.'?|\['?/g, ";") - .replace(/;;;|;;/g, ";..;") - .replace(/;$|'?\]|'$/g, "") - .replace(/#([0-9]+)/g, function($0,$1){return subx[$1];}); - }, - asPath: function(path) { - var x = path.split(";"), p = "$"; - for (var i=1,n=x.length; i