extragear/multimedia/amarok/src/context

[Mark Kretschmann]

SVN commit 878467 by markey:

Made Amarok compile/work with latest libplasma trunk (r878420).

This was _a lot_ of work since they renamed many classes, changed around stuff, etc. I did my best to port it all, but you might notice a few regressions. I will try (hopefully with your help) to fix the problems ASAP.

Known problem: Only 2 containments active, instead of 4. Reason unknown.

One could argue that we shouldn't bump libplasma (for fear of regressions), but on the other hand the new version also contains many bugfixes. And we need to bump it anyway at some point, and the longer you wait, the harder it gets.

CCMAIL: amarok-devel at kde.org


 M  +9 -17     CMakeLists.txt  
 M  +9 -5      ContextView.cpp  
 M  +2 -2      ContextView.h  
 M  +7 -7      applets/lyrics/LyricsApplet.cpp  
 M  +5 -5      applets/lyrics/LyricsApplet.h  
 M  +7 -7      applets/mediadevices/MediaDevicesApplet.cpp  
 M  +4 -4      applets/mediadevices/MediaDevicesApplet.h  
 M  +6 -6      applets/serviceinfo/ServiceInfo.cpp  
 M  +4 -4      applets/serviceinfo/ServiceInfo.h  
 M  +6 -6      applets/wikipedia/WikipediaApplet.cpp  
 M  +4 -4      applets/wikipedia/WikipediaApplet.h  
 M  +6 -5      containments/ColumnContainment.cpp  
 M  +8 -8      containments/ColumnContainment.h  
 M  +1 -1      widgets/ContainmentSelectionLayer.cpp  
 M  +1 -1      widgets/ContainmentSelectionLayer.h  
 M  +9 -9      widgets/ToolBoxIcon.cpp  
 M  +2 -2      widgets/ToolBoxIcon.h