Consolidate some optionsdb code
Moderator: Committer
Consolidate some optionsdb code
The following patch factorize some cut-n-pasted code to serialize the XML config file. There were slight differences in the 6 different versions, I hope to have chosen the right copy...
diffstat is nice: 7 files changed, 26 insertions(+), 80 deletions(-) Edit: here is another Directories.{cpp,h} consolidation, that may need compile testing under windows and macosx. Runtime testing would even be nicer...
Diffstat is additional to the previous one : 7 files changed, 52 insertions(+), 160 deletions(-)
diffstat is nice: 7 files changed, 26 insertions(+), 80 deletions(-) Edit: here is another Directories.{cpp,h} consolidation, that may need compile testing under windows and macosx. Runtime testing would even be nicer...
Diffstat is additional to the previous one : 7 files changed, 52 insertions(+), 160 deletions(-)
All the patches I'll provide for freeorion will be released under the GPL v2 or later license.
Let's unleash the dyson forest powa!
Let's unleash the dyson forest powa!
- adrian_broher
- Programmer
- Posts: 1156
- Joined: Fri Mar 01, 2013 9:52 am
- Location: Germany
Re: Consolidate some optionsdb code
Commited as r7686.vincele wrote:The following patch factorize some cut-n-pasted code to serialize the XML config file. There were slight differences in the 6 different versions, I hope to have chosen the right copy...
diffstat is nice: 7 files changed, 26 insertions(+), 80 deletions(-)
Not commited, the boost::fs v2 api should go away soon.vincele wrote:Edit: here is another Directories.{cpp,h} consolidation, that may need compile testing under windows and macosx. Runtime testing would even be nicer...
Diffstat is additional to the previous one : 7 files changed, 52 insertions(+), 160 deletions(-)
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Re: Consolidate some optionsdb code
Thanksadrian_broher wrote:Commited as r7686.
OK But part of that should still be of interrest, I'll rediff after the one from that other thread lands...adrian_broher wrote:Not commited, the boost::fs v2 api should go away soon.
All the patches I'll provide for freeorion will be released under the GPL v2 or later license.
Let's unleash the dyson forest powa!
Let's unleash the dyson forest powa!
- adrian_broher
- Programmer
- Posts: 1156
- Joined: Fri Mar 01, 2013 9:52 am
- Location: Germany
Re: Consolidate some optionsdb code
Feel free to do so.vincele wrote:PK But part of that should still be of interrest, I'll rediff after the one from that other thread lands...adrian_broher wrote:Commited as r7686.
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Re: Consolidate some optionsdb code
Now that we got rid of Boost FS v2, I rediffed the remaining piece of this cleanup against current svn trunk... Diffstat still interesting : 7 files changed, 42 insertions(+), 137 deletions(-)adrian_broher wrote:Feel free to do so.vincele wrote:But part of that should still be of interest, I'll rediff after the one from that other thread lands...
All the patches I'll provide for freeorion will be released under the GPL v2 or later license.
Let's unleash the dyson forest powa!
Let's unleash the dyson forest powa!
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: Consolidate some optionsdb code
Edited version committed.
Re: Consolidate some optionsdb code
Thanks, can you explain what has been edited, so that maybe next time it won't be needed...
All the patches I'll provide for freeorion will be released under the GPL v2 or later license.
Let's unleash the dyson forest powa!
Let's unleash the dyson forest powa!
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: Consolidate some optionsdb code
I removed the AbsolutePath function as it wasn't used. I renamed Path to FilenameToPath as the former is too generic.