Re: [Rosegarden-devel] qt5 merge status

[Ted F. <te...@te...>]

On 06/25/2014 08:42 AM, Richard Bown wrote:
> Saying that nicely teased out a few of course.  One I can't get my head
> around is this in editors/segment/compositionview/CompositionItemImpl.h
>
> class CompositionItemImpl : public _CompositionItem {
>
> C:\rosegarden-for-windows\RosegardenW\gui\editors\segment\compositionview\CompositionItemImpl.h:40:
> error: expected class-name before '{' token
>   class CompositionItemImpl : public _CompositionItem {
>                                                       ^

   I've simplified and rewritten quite a bit of stuff in this area. 
Neither of those names exist anymore in current rg.  CompositionItemImpl 
and _CompositionItem have been combined into a single CompositionItem. 
If you've synced up with the latest trunk, it might be as simple as 
deleting CompositionItemImpl.cpp.  OTOH, you might have made changes to 
it that you need.  Seems unlikely as CompositionItem is not OS-dependent.

   I am chipping away at the qt5 stuff a little today in trunk.  Just 
the ones in areas that I can easily test.  Shouldn't cause you too much 
trouble, I hope.

Ted.