Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TIMOB-9141 BlackBerry: Fix merge problems #53

Merged
merged 2 commits into from May 16, 2012

Conversation

jpl-mac
Copy link

@jpl-mac jpl-mac commented May 16, 2012

Reviewers: DL + DC

Fix some issues coming from merges
Also modify the population of the functionMap so order won't be an issue anymore.

  • Use a vector for the map
  • use enum instead of defines for the PROP ids, will give a bit more robustness,
    particularly protect against duplicates in prop names and in values
    Also allows keeping the prop in alphabetical order

Changelog:

  • Use vector for the functionMap, added a static initializer
  • Changed the type of the first param of setPropertyValue to size_t to prevent compiler warning about signed/unsigned comparison
  • Removed left over setTop(float) declaration
  • use enum for N_PROP ids
  • use props everywhere in setTiMappingProperties
  • updated app.js to use title for button text
  • Commented a call that doesn't compile on R4
  • Removed icon assets from bar-descriptor that don't exist anymore

Tests:

  • Built tibb lib for all 3 targets
  • Built tibbtest for all 3 targets
  • Validated that app.js still works as before and labels do get displayed
  • Tested everything with R4 tools

Jean-Philippe Lemieux added 2 commits May 16, 2012 16:20
Fix some issues coming from merges
Also modify the population of the functionMap so order won't be an issue anymore.
- Use a vector for the map
- use enum instead of defines for the PROP ids, will give a bit more robustness,
  particularly protect against duplicates in prop names and in values
  Also allows keeping the prop in alphabetical order

Changelog:
- Use vector for the functionMap, added a static initializer
- Changed the type of the first param of setPropertyValue to size_t to prevent compiler warning about signed/unsigned comparison
- Removed left over setTop(float) declaration
- use enum for N_PROP ids
- use props everywhere in setTiMappingProperties
- updated app.js to use title for button text
- Commented a call that doesn't compile on R4
- Removed icon assets from bar-descriptor that don't exist anymore

Tests:
- Built tibb lib for all 3 targets
- Built tibbtest for all 3 targets
- Validated that app.js still works as before and labels do get displayed
- Tested everything with R4 tools
renamed the init function to initFunctionMap
@jpl-mac
Copy link
Author

jpl-mac commented May 16, 2012

Pushed a slightly better initialization of the functionMap

jpl-mac pushed a commit that referenced this pull request May 16, 2012
TIMOB-9141 BlackBerry: Fix merge problems
@jpl-mac jpl-mac merged commit 5292fb8 into Macadamian:blackberry May 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants