Hi all, On Tue, Apr 2, 2013 at 12:47 PM, Matěj Laitl <ma...@laitl.cz> wrote: > Git commit 6f87755c9ab292dc0c590140f133dadead7304f3 by Matěj Laitl, on behalf > of Tatjana Gornak. > Committed on 02/04/2013 at 12:08. > Pushed by laitl into branch 'master'. > > Biggie: PlaylistFile refactoring, code deduplication, asynchronous loading
That breaks the build for me: home/myriam/kde/src/amarok/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp:114:23: error: redefinition of 'track' with a different type: 'Meta::TrackPtr' (aka 'KSharedPtr<Meta::Track>') vs 'const Playlists::XSPFTrack &' Meta::TrackPtr track( proxyTrack.data() ); ^ /home/myriam/kde/src/amarok/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp:105:31: note: previous definition is here foreach( const XSPFTrack &track, xspfTracks ) ^ /usr/include/qt4/QtCore/qglobal.h:2377:10: note: expanded from macro 'Q_FOREACH' for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;})) ^ /home/myriam/kde/src/amarok/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp:115:23: error: no viable conversion from 'const Playlists::XSPFTrack' to 'const Meta::TrackPtr' (aka 'const KSharedPtr<Meta::Track>') addProxyTrack( track ); ^~~~~ /usr/include/KDE/../ksharedptr.h:83:12: note: candidate constructor not viable: no known conversion from 'const Playlists::XSPFTrack' to 'const KSharedPtr<Meta::Track> &' for 1st argument inline KSharedPtr( const KSharedPtr& o ) ^ /home/myriam/kde/src/amarok/src/core-impl/playlists/types/file/PlaylistFile.h:111:55: note: passing argument to parameter 'proxyTrack' here void addProxyTrack( const Meta::TrackPtr &proxyTrack ); ^ 2 errors generated. make[2]: *** [src/CMakeFiles/amaroklib.dir/core-impl/playlists/types/file/xspf/XSPFPlaylist.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [src/CMakeFiles/amaroklib.dir/all] Error 2 -- Proud member of the Amarok and KDE Community Protect your freedom and join the Fellowship of FSFE: http://www.fsfe.org Please don't send me proprietary file formats, use ISO standard ODF instead (ISO/IEC 26300) _______________________________________________ Amarok-devel mailing list Amarok-devel@kde.org https://mail.kde.org/mailman/listinfo/amarok-devel