lp:~gary-wzl77/scope-aggregator/4.8-opt

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:scope-aggregator at revision 165

Kyle Nitzsche (community): Approve on 2016-06-29

Zhang Enwei (community): Approve on 2016-06-29

Jin: Pending requested 2016-06-28

Penk Chen: Pending requested 2016-06-28

Diff: 3146 lines (+869/-930)

9 files modified

include/aggchildscope.h (+38/-44)
include/query.h (+91/-85)
include/scope.h (+19/-7)
src/CMakeLists.txt (+3/-0)
src/action.cpp (+2/-4)
src/aggchildscope.cpp (+46/-46)
src/query.cpp (+158/-96)
src/scope.cpp (+106/-93)
src/utils.cpp (+406/-555)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

175. By Gary.Wang on 2016-06-29

code change according to reviewer's comments.

174. By Gary.Wang on 2016-06-28

1.compile time optimization for string(QStringLiteral).
2.load json file in one function(load_json_file) instead of using QJsonDocument for each json file loading.
3.specify 'const' keyword for some variable in some cases.
4.pass by reference instead of by value if possible.
5.don't allocated memory(make_shared) based on local variable to avoid copy constructor.
6.object duplicated creation.
7.fix invalid pointer for us::Category::SCPtr when look_up is called.
8.remove redundant files.

173. By Kyle Nitzsche on 2016-06-27

fixed 4.8-rebase-local-hints-README.md doc per review comment.

updated make-po.sh per review comment.

172. By Kyle Nitzsche on 2016-06-23

removed jsoncpp. see previous commit message.

171. By Kyle Nitzsche on 2016-06-23

various minor improvemnts, BUT. I just discovered the 0.6 version of jsoncpp
cannot handle double values with internationalization.
https://sourceforge.net/p/jsoncpp/bugs/43/

our rootfs has 0.6. And, some of our scope-agg json may contain doubles,
for example art aspect ratio. Therefore, I need to use something else and
since the rest of the project is qt json, I will now change the new
local hints support to qt json.

170. By Kyle Nitzsche on 2016-06-17

works now for today scope entirely.

169. By Kyle Nitzsche on 2016-06-16

modified structure of hints.json

168. By Kyle Nitzsche on 2016-06-16

working, but I may want to recoonfiured hints.json

167. By Kyle Nitzsche on 2016-06-14

merge-hints-po-to-other-po takes one arg: another po/ dir.

This scope merges the lang.po files here with the lang.po files there such
that in the end, the lang.po file their has the superset of translations.

After the merge, the other po dir's po files should be updated against its
pot file to sync to local translatable strings.

166. By Kyle Nitzsche on 2016-06-13

make_pot.sh now calls json_get_i18n.py for every json file in JSONS.
json_get_i18n.py gets all translatable json objects (the key starts with
and underscore) and creates a new json object containing just those. This
is written to local file i18n.json and is used by make_pot.sh while making
the new pot file. Why? because make_pot.sh calls json2po to convert json
files to po format for inclusion in the pot, but json2po fails if the json
has any object value of type int. Until now, this has not been a problem,
but with the move to local hints, the hints.json file now contains json
for each category renderer, and these always contain some int values.