File trinity-amarok-gcc6.patch of Package kde3-amarok

From 13fa4cffad157c41fccbaa6018ffb9a31f10e16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 3 Sep 2016 17:48:42 +0200
Subject: Fix FTBFS with GCC6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 amarok/src/contextbrowser.cpp                            | 2 +-
 amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp | 2 +-
 amarok/src/mediadevice/generic/genericmediadevice.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 5411de90..fedd216e 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -466,7 +466,7 @@ void ContextBrowser::openURLRequest( const KURL &url )
         // Konqueror sidebar needs these
         if (url.path() == "context") { m_dirtyCurrentTrackPage=true; showContext( KURL( "current://track" ) ); saveHtmlData(); }
         if (url.path() == "wiki") { m_dirtyWikiPage=true; showWikipedia(); saveHtmlData(); }
-        if (url.path() == "lyrics") { m_dirtyLyricsPage=true; m_wikiJob=false; showLyrics(); saveHtmlData(); }
+        if (url.path() == "lyrics") { m_dirtyLyricsPage=true; m_wikiJob=0; showLyrics(); saveHtmlData(); }
     }
 
     else if ( url.protocol() == "runscript" )
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
index 53cd2253..559c628e 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
@@ -167,7 +167,7 @@ void MagnatuneAlbumDownloader::coverDownloadAborted( )
     m_albumDownloadJob = 0;
     debug() << "Aborted cover download" << endl;
 
-    emit( coverDownloadComplete( false ) );
+    emit( coverDownloadComplete( 0 ) );
 }
 
 void MagnatuneAlbumDownloader::coverAddComplete(KIO::Job * downloadJob)
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 017c58e6..585d534e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -440,7 +440,7 @@ GenericMediaDevice::renameItem( TQListViewItem *item ) // SLOT
     debug() << "Renaming: " << src << " to: " << dst << endl;
 
     //do we want a progress dialog?  If so, set last false to true
-    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) )
+    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, 0 ) )
     {
         m_mfm.erase( m_mim[item]->getFullName() );
         m_mim[item]->setNamesFromBase( item->text(0) );
-- 
cgit v1.2.3

openSUSE Build Service is sponsored by