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

[settings/lib] implement missing CSettingList/Int/String::MergeDetails() #17503

Merged
merged 1 commit into from Apr 19, 2020

Conversation

Montellese
Copy link
Member

Description

I just noticed that in 0511fb2 from #16773 I forgot to fully implement the CSetting::MergeDetails() method for CSettingList, CSettingInt and CSettingString.

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@Montellese Montellese added Type: Fix non-breaking change which fixes an issue Component: Settings v19 Matrix labels Mar 14, 2020
@Montellese Montellese added this to the Matrix 19.0-alpha 1 milestone Mar 14, 2020
@Montellese Montellese added this to In progress in General (roadmap) via automation Mar 14, 2020
Copy link
Member

@Rechi Rechi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please follow the current code guidelines.

xbmc/settings/lib/Setting.cpp Outdated Show resolved Hide resolved
xbmc/settings/lib/Setting.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@phunkyfish phunkyfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

General (roadmap) automation moved this from In progress to Reviewer approved Apr 18, 2020
@Montellese Montellese merged commit 09174d5 into xbmc:master Apr 19, 2020
General (roadmap) automation moved this from Reviewer approved to Done Apr 19, 2020
@Montellese Montellese deleted the bugfix/setting_merge_details branch April 19, 2020 11:24
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Apr 20, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request May 5, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 3, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 7, 2020
…tails

[settings/lib] implement missing CSettingList/Int/String::MergeDetails()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Settings Type: Fix non-breaking change which fixes an issue v19 Matrix
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants