[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2007-05-20 9:25:17
Message-ID: 1179653117.730240.25131.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 666547 by mkossick:

use KUrl instead of QUrl...makes EBN happy
fixed warning

 M  +12 -11    contextbrowser.cpp  
 M  +2 -1      coverfetcher.cpp  
 M  +1 -1      tracktooltip.cpp  


--- trunk/extragear/multimedia/amarok/src/contextbrowser.cpp #666546:666547
@@ -75,6 +75,7 @@
 #include <kmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
+#include <KUrl>
 #include <KVBox> //wiki tab
 
 #include <unistd.h> //usleep()
@@ -569,9 +570,9 @@
     else if ( url.protocol() == "musicbrainz" )
     {
         const QString url = \
                "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3";
                
-        Amarok::invokeBrowser( url.arg( QUrl::toPercentEncoding( artist, "/" ),
-        QString( QUrl::toPercentEncoding( album, "/" ) ),
-        QString( QUrl::toPercentEncoding( track, "/" ) ) ) );
+        Amarok::invokeBrowser( url.arg( KUrl::toPercentEncoding( artist, "/" ),
+        QString( KUrl::toPercentEncoding( album, "/" ) ),
+        QString( KUrl::toPercentEncoding( track, "/" ) ) ) );
     }
 
     else if ( url.protocol() == "externalurl" )
@@ -619,7 +620,7 @@
     else if( url.protocol() == "ggartist" )
     {
         const QString url2 = QString( \
                "http://www.google.com/musicsearch?q=%1&res=artist" )
-            .arg( QString( QUrl::toPercentEncoding( unescapeHTMLAttr( url.path() \
).replace( " ", "+" ), "/" ) ) ); +            .arg( QString( \
KUrl::toPercentEncoding( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), "/" ) ) \
);  Amarok::invokeBrowser( url2 );
     }
 
@@ -3330,8 +3331,8 @@
     }
 
     m_lyricSearchUrl = QString( \
                "http://www.google.com/search?ie=UTF-8&q=lyrics+%1+%2" )
-        .arg( QString( QUrl::toPercentEncoding( '"' + artist + '"', "/" ) ),
-              QString( QUrl::toPercentEncoding( '"' + title  + '"', "/" ) ) );
+        .arg( QString( KUrl::toPercentEncoding( '"' + artist + '"', "/" ) ),
+              QString( KUrl::toPercentEncoding( '"' + title  + '"', "/" ) ) );
 
     //m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false);
     wikiExternalPageAction->setEnabled(false);
@@ -3448,10 +3449,10 @@
     spec.setGroup( "Lyrics" );
 
     m_lyricAddUrl = spec.readPathEntry( "add_url" );
-    m_lyricAddUrl.replace( "MAGIC_ARTIST", QUrl::toPercentEncoding( \
                EngineController::instance()->bundle().artist(), "/" ) );
-    m_lyricAddUrl.replace( "MAGIC_TITLE", QUrl::toPercentEncoding( \
                EngineController::instance()->bundle().title(), "/" ) );
-    m_lyricAddUrl.replace( "MAGIC_ALBUM", QUrl::toPercentEncoding( \
                EngineController::instance()->bundle().album(), "/" ) );
-    m_lyricAddUrl.replace( "MAGIC_YEAR", QUrl::toPercentEncoding( QString::number( \
EngineController::instance()->bundle().year() ), "/" ) ); +    m_lyricAddUrl.replace( \
"MAGIC_ARTIST", KUrl::toPercentEncoding( \
EngineController::instance()->bundle().artist(), "/" ) ); +    m_lyricAddUrl.replace( \
"MAGIC_TITLE", KUrl::toPercentEncoding( \
EngineController::instance()->bundle().title(), "/" ) ); +    m_lyricAddUrl.replace( \
"MAGIC_ALBUM", KUrl::toPercentEncoding( \
EngineController::instance()->bundle().album(), "/" ) ); +    m_lyricAddUrl.replace( \
"MAGIC_YEAR", KUrl::toPercentEncoding( QString::number( \
EngineController::instance()->bundle().year() ), "/" ) );  
 
     if ( el.tagName() == "suggestions" )
@@ -3796,7 +3797,7 @@
 ContextBrowser::wikiURL( const QString &item )
 {
     return QString( "http://%1.wikipedia.org/wiki/" ).arg( wikiLocale() )
-        + QUrl::toPercentEncoding( item, "/" );
+        + KUrl::toPercentEncoding( item, "/" );
 }
 
 void
--- trunk/extragear/multimedia/amarok/src/coverfetcher.cpp #666546:666547
@@ -33,6 +33,7 @@
 #include <kmessagebox.h>
 #include <kmenu.h>
 #include <kpushbutton.h>
+#include <kurl.h>
 #include <kvbox.h>
 #include <kwindowsystem.h>
 
@@ -235,7 +236,7 @@
     // changed to type=lite because it makes less traffic
     url = "http://xml.amazon." + tld
         + "/onca/xml3?t=webservices-20&dev-t=" + LICENSE
-        + "&KeywordSearch=" + QUrl::toPercentEncoding( query, "/" ) // FIXME: we \
will have to find something else +        + "&KeywordSearch=" + \
KUrl::toPercentEncoding( query, "/" ) // FIXME: we will have to find something else  \
+ "&mode=" + musicMode  + "&type=lite&locale=" + AmarokConfig::amazonLocale()
         + "&page=1&f=xml";
--- trunk/extragear/multimedia/amarok/src/tracktooltip.cpp #666546:666547
@@ -240,7 +240,7 @@
         // no title or no artist, so we add prettyTitle
             m_tooltip += QString ("<tr><td align=center colspan='2'>%1</td></tr>")
                       .arg(tags.veryNiceTitle());
-        for( uint x = 0; x < left.count(); ++x )
+        for( int x = 0; x < left.count(); ++x )
             if ( !right[x].isEmpty() )
                 m_tooltip += tableRow.arg( left[x] ).arg( right[x] );
 


[prev in list] [next in list] [prev in thread] [next in thread]