[MassifVisualizer] [massif-visualizer/frameworks] massifdata: Get rid of deprecated KFilterDev API.

Milian Wolff mail at milianw.de
Tue Aug 12 16:12:34 UTC 2014


On Tuesday 12 August 2014 17:23:59 Arnold Dumas wrote:
> Le 11/08/2014 15:03, Milian Wolff a écrit :
> > On Monday 11 August 2014 14:11:35 Arnold Dumas wrote:
> >> Le 11/08/2014 12:23, Milian Wolff a écrit :
> >> > On Sunday 10 August 2014 18:50:05 Arnold Dumas wrote:
> >> >> Git commit cd4091fe8bf341a0709fa217f2904b61f46674b5 by Arnold Dumas.
> >> >> Committed on 10/08/2014 at 18:44.
> >> >> Pushed by arnolddumas into branch 'frameworks'.
> >> >> 
> >> >> Get rid of deprecated KFilterDev API.
> >> >> 
> >> >> M  +1    -1    massifdata/parseworker.cpp
> >> >> 
> >> >> http://commits.kde.org/massif-visualizer/cd4091fe8bf341a0709fa217f2904
> >> >> b61
> >> >> f46 674b5
> >> >> 
> >> >> diff --git a/massifdata/parseworker.cpp b/massifdata/parseworker.cpp
> >> >> index 684bd54..af75d61 100644
> >> >> --- a/massifdata/parseworker.cpp
> >> >> +++ b/massifdata/parseworker.cpp
> >> >> @@ -60,7 +60,7 @@ void ParseWorker::parse(const QUrl &url, const
> >> >> QStringList& allocators) #endif
> >> >> 
> >> >>      file = url.toLocalFile();
> >> >> 
> >> >> -    QScopedPointer<QIODevice>
> >> >> device(KFilterDev::deviceForFile(file));
> >> >> +    QScopedPointer<QIODevice> device(new KFilterDev(file));
> >> >> 
> >> >>      if (!device->open(QIODevice::ReadOnly)) {
> >> >>      
> >> >>          emit error(i18n("Read Failed"),
> >> >>          
> >> >>                     i18n("Could not open file <i>%1</i> for reading.",
> >> >> 
> >> >> file));
> >> > 
> >> > Nice work btw with debugging the issue here! Also, now that the API
> >> > changed
> >> > (to the better), we could/should do the following instead to safe the
> >> > heap
> >> > allocation:
> >> > 
> >> > KFilterDev device(file);
> >> > if (device.open(...)) {
> >> > 
> >> >   ...
> >> > 
> >> > }
> >> > 
> >> > Bye
> >> 
> >> Thanks, this issue has been driving me crazy for weeks... Hopefuly
> >> it's
> >> now working like a charm again.
> > 
> > Great.
> > 
> >> Your suggestion was very welcomed, it was totally overkilled to have
> >> this QScopedPointer stuff, please see
> >> http://quickgit.kde.org/?p=massif-visualizer.git&a=commit&h=ab299463da570
> >> 0b1 50a2d3d3143aef472da04c79.
> > 
> > Jup, saw it - thank you!
> > 
> >> I'm going on holidays this week so don't expect too much changes in
> >> the
> >> following days. ;)
> > 
> > Enjoy, you deserved it :)
> 
> Well the weather is _really_ awful, so I'll do the merge this week I
> think.

Too bad.

> Just to be sure, is it ok to merge, it won't compile, and then to port
> the merged feature to KF5? Because if I do so, the frameworks branch
> might no build during about a week. Sorry for this newbie question. ;S

You can merge master into frameworks, then fix the issues as you find them, 
and once you are ready commit it all to frameworks. Considering that noone 
else will work on this than you, you can take all the time you want.

Does that sound OK to you?

Bye

-- 
Milian Wolff
mail at milianw.de
http://milianw.de


More information about the Massif-visualizer mailing list