Make sure we always delete replies when finished with the network request.

src/infoplugins/generic/charts/ChartsPlugin.cpp

@@ -4,6 +4,7 @@
  *   Copyright 2011-2012, Hugo Lindström <hugolm84@gmail.com>
  *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -290,6 +291,7 @@ ChartsPlugin::chartSourcesList()
 {
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got chart sources list";
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     if ( reply->error() == QNetworkReply::NoError )
     {
@@ -432,6 +434,7 @@ ChartsPlugin::chartsList()
 {
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got chart list result";
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     if ( reply->error() == QNetworkReply::NoError )
     {
@@ -623,6 +626,7 @@ ChartsPlugin::chartReturned()
 {
     /// Chart request returned something! Woho
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     QVariantMap returnedData;
 
     if ( reply->error() == QNetworkReply::NoError )

src/infoplugins/generic/echonest/EchonestPlugin.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -177,6 +177,7 @@ void
 EchonestPlugin::getArtistBiographySlot()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Echonest::Artist artist = artistFromReply( reply );
     Echonest::BiographyList biographies = artist.biographies();
     QVariantMap biographyMap;
@@ -192,7 +193,6 @@ EchonestPlugin::getArtistBiographySlot()
     }
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
     emit info( requestData, biographyMap );
-    reply->deleteLater();
 }
 
 
@@ -200,11 +200,11 @@ void
 EchonestPlugin::getArtistFamiliaritySlot()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Echonest::Artist artist = artistFromReply( reply );
     qreal familiarity = artist.familiarity();
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
     emit info( requestData, familiarity );
-    reply->deleteLater();
 }
 
 
@@ -212,11 +212,11 @@ void
 EchonestPlugin::getArtistHotttnesssSlot()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Echonest::Artist artist = artistFromReply( reply );
     qreal hotttnesss = artist.hotttnesss();
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
     emit info( requestData, hotttnesss );
-    reply->deleteLater();
 }
 
 
@@ -224,6 +224,7 @@ void
 EchonestPlugin::getArtistTermsSlot()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Echonest::Artist artist = artistFromReply( reply );
     Echonest::TermList terms = artist.terms();
     QVariantMap termsMap;
@@ -235,7 +236,6 @@ EchonestPlugin::getArtistTermsSlot()
     }
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
     emit info( requestData, termsMap );
-    reply->deleteLater();
 }
 
 
@@ -243,6 +243,7 @@ void
 EchonestPlugin::getMiscTopSlot()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Echonest::TermList terms = Echonest::Artist::parseTopTerms( reply );
     QVariantMap termsMap;
     Q_FOREACH( const Echonest::Term& term, terms ) {
@@ -253,7 +254,6 @@ EchonestPlugin::getMiscTopSlot()
     }
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
     emit info( requestData, termsMap );
-    reply->deleteLater();
 }
 
 

src/infoplugins/generic/hypem/HypemPlugin.cpp

@@ -2,6 +2,7 @@
  *
  *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -318,6 +319,8 @@ HypemPlugin::chartReturned()
 
     /// Chart request returned something! Woho
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
+
     QString url = reply->url().toString();
     QVariantMap returnedData;
     if ( reply->error() == QNetworkReply::NoError )

src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -155,6 +155,7 @@ MusicBrainzPlugin::gotReleaseGroupsSlot()
     QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
     if ( !oldReply )
         return; //timeout will handle it
+    oldReply->deleteLater();
 
     QDomDocument doc;
     doc.setContent( oldReply->readAll() );
@@ -213,6 +214,7 @@ MusicBrainzPlugin::gotReleasesSlot()
     QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
     if ( !oldReply )
         return; //timeout will handle it
+    oldReply->deleteLater();
 
     QDomDocument doc;
     doc.setContent( oldReply->readAll() );
@@ -260,6 +262,7 @@ MusicBrainzPlugin::gotRecordingsSlot()
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     if ( !reply )
         return; //timeout will handle it
+    reply->deleteLater();
 
     QDomDocument doc;
     doc.setContent( reply->readAll() );

src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -112,6 +112,7 @@ MusixMatchPlugin::trackSearchSlot()
     QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
     if ( !oldReply )
         return; //timeout will handle it
+    oldReply->deleteLater();
 
     QDomDocument doc;
     doc.setContent(oldReply->readAll());
@@ -142,6 +143,7 @@ MusixMatchPlugin::trackLyricsSlot()
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     if ( !reply )
         return; //timeout will handle it
+    reply->deleteLater();
 
     QDomDocument doc;
     doc.setContent( reply->readAll() );

src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp

@@ -4,6 +4,7 @@
  *   Copyright 2011-2012, Hugo Lindström <hugolm84@gmail.com>
  *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -295,11 +296,13 @@ NewReleasesPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requ
     }
 }
 
+
 void
 NewReleasesPlugin::nrSourcesList()
 {
     tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "Got newreleases sources list";
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     if ( reply->error() == QNetworkReply::NoError )
     {
@@ -434,6 +437,7 @@ NewReleasesPlugin::nrList()
 {
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got newreleases list result";
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     if ( reply->error() == QNetworkReply::NoError )
     {
@@ -658,13 +662,15 @@ NewReleasesPlugin::getMaxAge( const qlonglong expires ) const
     return 0;
 }
 
+
 void
 NewReleasesPlugin::nrReturned()
 {
     /// Chart request returned something! Woho
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QVariantMap returnedData;
+    reply->deleteLater();
 
+    QVariantMap returnedData;
     if ( reply->error() == QNetworkReply::NoError )
     {
         bool ok;

src/infoplugins/generic/rovi/RoviPlugin.cpp

@@ -2,6 +2,7 @@
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -121,6 +122,7 @@ RoviPlugin::albumLookupFinished()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
     Q_ASSERT( reply );
+    reply->deleteLater();
 
     if ( reply->error() != QNetworkReply::NoError )
         return;

src/infoplugins/generic/spotify/SpotifyPlugin.cpp

@@ -2,6 +2,7 @@
  *
  *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -196,6 +197,7 @@ SpotifyPlugin::chartTypes()
     /// Get possible chart type for specificSpotifyPlugin: InfoChart types returned chart source
     tDebug() << Q_FUNC_INFO << "Got spotifychart type result";
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     if ( reply->error() == QNetworkReply::NoError )
     {
@@ -284,6 +286,7 @@ SpotifyPlugin::chartReturned()
 {
     /// Chart request returned something! Woho
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     QString url = reply->url().toString();
     QVariantMap returnedData;
     if ( reply->error() == QNetworkReply::NoError )

src/libtomahawk/AtticaManager.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -461,6 +462,7 @@ AtticaManager::resolverIconFetched()
 {
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( reply );
+    reply->deleteLater();
 
     const QString resolverId = reply->property( "resolverId" ).toString();
 
@@ -631,6 +633,7 @@ AtticaManager::payloadFetched()
 {
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( reply );
+    reply->deleteLater();
 
     bool installedSuccessfully = false;
     const QString resolverId = reply->property( "resolverId" ).toString();

src/libtomahawk/EchonestCatalogSynchronizer.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -120,6 +121,7 @@ EchonestCatalogSynchronizer::catalogDeleted()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     QString toDel = QString( "collection/%1Catalog" ).arg( r->property( "type" ).toString() );
 
@@ -153,6 +155,7 @@ EchonestCatalogSynchronizer::songCreateFinished()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     tDebug() << "Finished creating song catalog, updating data now!!";
     try
@@ -187,6 +190,7 @@ EchonestCatalogSynchronizer::artistCreateFinished()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     // We don't support artist catalogs at the moment
     return;
@@ -270,6 +274,7 @@ EchonestCatalogSynchronizer::songUpdateFinished()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     try
     {
@@ -289,6 +294,7 @@ EchonestCatalogSynchronizer::checkTicket()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     try
     {

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp

@@ -550,6 +550,7 @@ void
 LastFmInfoPlugin::similarArtistsReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     QMap< int, QString > similarArtists = lastfm::Artist::getSimilar( reply );
 
@@ -591,6 +592,7 @@ void
 LastFmInfoPlugin::similarTracksReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     QMap< int, QPair< QString, QString > > similarTracks = lastfm::Track::getSimilar( reply );
 
@@ -643,6 +645,7 @@ void
 LastFmInfoPlugin::chartReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     QVariantMap returnedData;
     const QRegExp tracks_rx( "chart\\.\\S+tracks\\S*", Qt::CaseInsensitive );
@@ -689,6 +692,7 @@ void
 LastFmInfoPlugin::topTracksReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
 
     QStringList topTracks = lastfm::Artist::getTopTracks( reply );
     topTracks.removeDuplicates();
@@ -711,6 +715,7 @@ void
 LastFmInfoPlugin::artistInfoReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
 
     if ( requestData.type == Tomahawk::InfoSystem::InfoArtistBiography )
@@ -771,6 +776,7 @@ void
 LastFmInfoPlugin::albumInfoReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
 
     if ( requestData.type == Tomahawk::InfoSystem::InfoAlbumCoverArt )
@@ -797,6 +803,7 @@ void
 LastFmInfoPlugin::coverArtReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
     if ( redir.isEmpty() )
     {
@@ -836,8 +843,6 @@ LastFmInfoPlugin::coverArtReturned()
         newReply->setProperty( "requestData", reply->property( "requestData" ) );
         connect( newReply, SIGNAL( finished() ), SLOT( coverArtReturned() ) );
     }
-
-    reply->deleteLater();
 }
 
 
@@ -845,6 +850,7 @@ void
 LastFmInfoPlugin::artistImagesReturned()
 {
     QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    reply->deleteLater();
     QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
     if ( redir.isEmpty() )
     {
@@ -888,8 +894,6 @@ LastFmInfoPlugin::artistImagesReturned()
         newReply->setProperty( "requestData", reply->property( "requestData" ) );
         connect( newReply, SIGNAL( finished() ), SLOT( artistImagesReturned() ) );
     }
-
-    reply->deleteLater();
 }
 
 
@@ -934,7 +938,8 @@ void
 LastFmInfoPlugin::onAuthenticated()
 {
     QNetworkReply* authJob = dynamic_cast<QNetworkReply*>( sender() );
-    if ( !authJob || m_account.isNull() )
+    authJob->deleteLater();
+    if ( m_account.isNull() )
     {
         tLog() << Q_FUNC_INFO << "Help! No longer got a last.fm auth job!";
         return;
@@ -964,8 +969,6 @@ LastFmInfoPlugin::onAuthenticated()
 
         tLog() << Q_FUNC_INFO << error.simplified();
     }
-
-    authJob->deleteLater();
 }
 
 

src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -293,6 +294,7 @@ EchonestGenerator::staticFinished()
     Q_ASSERT( qobject_cast< QNetworkReply* >( sender() ) );
 
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    reply->deleteLater();
 
     Echonest::SongList songs;
     try {
@@ -361,6 +363,7 @@ void
 EchonestGenerator::songLookupFinished()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    r->deleteLater();
 
     if( !m_waiting.contains( r ) ) // another generate/start was begun meanwhile, we're out of date
         return;
@@ -399,6 +402,7 @@ EchonestGenerator::dynamicStarted()
     Q_ASSERT( sender() );
     Q_ASSERT( qobject_cast< QNetworkReply* >( sender() ) );
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    reply->deleteLater();
 
     try
     {
@@ -417,6 +421,7 @@ EchonestGenerator::dynamicFetched()
     Q_ASSERT( sender() );
     Q_ASSERT( qobject_cast< QNetworkReply* >( sender() ) );
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    reply->deleteLater();
 
     try
     {
@@ -733,6 +738,7 @@ EchonestGenerator::moodsReceived()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     try
     {
@@ -762,6 +768,7 @@ EchonestGenerator::stylesReceived()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     try
     {
@@ -789,6 +796,7 @@ EchonestGenerator::genresReceived()
 {
     QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     try
     {

src/libtomahawk/utils/GroovesharkParser.cpp

@@ -3,6 +3,7 @@
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Hugo Lindstr<74>m <hugolm84@gmail.com>
  *   Copyright 2010-2012, Stefan Derkits <stefan@derkits.at>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -163,9 +164,9 @@ GroovesharkParser::trackPageFetchFinished()
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     m_queries.remove( r );
-    r->deleteLater();
 
     QWebPage page;
     page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
@@ -195,9 +196,9 @@ GroovesharkParser::groovesharkLookupFinished()
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     m_queries.remove( r );
-    r->deleteLater();
 
     if ( r->reply()->error() == QNetworkReply::NoError )
     {

src/libtomahawk/utils/ItunesParser.cpp

@@ -3,6 +3,7 @@
  *   Written by Hugo Lindström <hugolm84@gmail.com>
  *   But based on Leo Franchi's work from spotifyParser
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -128,8 +129,8 @@ ItunesParser::itunesResponseLookupFinished()
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
-    m_queries.remove( r );
     r->deleteLater();
+    m_queries.remove( r );
 
     if ( r->reply()->error() == QNetworkReply::NoError )
     {

src/libtomahawk/utils/JspfLoader.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -99,13 +100,13 @@ void
 JSPFLoader::networkLoadFinished()
 {
     NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
+    r->deleteLater();
+
     if ( r->reply()->error() == QNetworkReply::NoError )
     {
         m_body = r->reply()->readAll();
         gotBody();
     }
-
-    r->deleteLater();
 }
 
 

src/libtomahawk/utils/ShortenedLinkParser.cpp

@@ -1,7 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -98,6 +98,7 @@ ShortenedLinkParser::lookupFinished( const QUrl& url )
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
+    r->deleteLater();
 
     if ( r->reply()->error() != QNetworkReply::NoError )
         JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Network error parsing shortened link!" ) ) );
@@ -105,7 +106,6 @@ ShortenedLinkParser::lookupFinished( const QUrl& url )
     tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Got an un-shortened url:" << r->reply()->url().toString();
     m_links << url.toString();
     m_queries.remove( r );
-    r->deleteLater();
 
     checkFinished();
 }

src/libtomahawk/utils/SpotifyParser.cpp

@@ -2,6 +2,7 @@
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -220,9 +221,8 @@ SpotifyParser::spotifyBrowseFinished()
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
-
-    m_queries.remove( r );
     r->deleteLater();
+    m_queries.remove( r );
 
     if ( r->reply()->error() == QNetworkReply::NoError )
     {
@@ -293,8 +293,8 @@ SpotifyParser::spotifyTrackLookupFinished()
 {
     NetworkReply* r = qobject_cast< NetworkReply* >( sender() );
     Q_ASSERT( r );
-    m_queries.remove( r );
     r->deleteLater();
+    m_queries.remove( r );
 
     if ( r->reply()->error() == QNetworkReply::NoError )
     {

src/libtomahawk/utils/XspfLoader.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2011-2012, Leo Franchi            <lfranchi@kde.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
@@ -183,13 +183,13 @@ void
 XSPFLoader::networkLoadFinished()
 {
     NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
+    r->deleteLater();
+
     if ( r->reply()->error() == QNetworkReply::NoError )
     {
         m_body = r->reply()->readAll();
         gotBody();
     }
-
-    r->deleteLater();
 }
 
 

src/tomahawk/TomahawkApp.cpp

@@ -782,6 +782,7 @@ TomahawkApp::spotifyApiCheckFinished()
 {
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( reply );
+    reply->deleteLater();
 
     DropJob::setCanParseSpotifyPlaylists( !reply->error() );
 }