[amarok/kf5] /: Merge remote-tracking branch 'origin/master' into kf5
Christoph Feck
cfeck at kde.org
Thu Sep 15 01:42:16 UTC 2016
Git commit 5698b821796d977a309717a2ddc56dac39571589 by Christoph Feck.
Committed on 15/09/2016 at 01:43.
Pushed by cfeck into branch 'kf5'.
Merge remote-tracking branch 'origin/master' into kf5
Please review the resolution of the conflicts.
CCMAIL: amarok-devel at kde.org
M +9 -9 cmake/modules/FindMySQLAmarok.cmake
M +0 -2 src/configdialog/dialogs/DatabaseConfig.cpp
M +5 -7 src/context/applets/lyrics/LyricsBrowser.cpp
M +1 -7 src/context/applets/wikipedia/WikipediaApplet.cpp
M +0 -1 src/context/applets/wikipedia/WikipediaApplet_p.h
M +1 -1 src/context/engines/tabs/TabsEngine.cpp
M +3 -15 src/context/engines/wikipedia/WikipediaEngine.cpp
M +34 -11 src/core-impl/collections/audiocd/AudioCdCollection.cpp
M +7 -0 src/core-impl/collections/audiocd/AudioCdCollection.h
M +2 -2 src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp
M +4 -1 src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
M +1 -1 src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp
M +1 -1 src/core-impl/collections/umscollection/podcasts/UmsPodcastMeta.cpp
M +2 -1 src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
M +1 -0 src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp
M +1 -1 src/core/podcasts/PodcastReader.cpp
M +1 -5 src/dbus/mpris2/MediaPlayer2.cpp
M +0 -2 src/dialogs/OrganizeCollectionDialog.h
M +1 -1 src/dialogs/TagDialog.cpp
M +1 -1 src/dynamic/biases/EchoNestBias.h
M +1 -1 src/importers/ImporterSqlConnection.h
M +1 -1 src/scripting/scriptconsole/ScriptConsole.cpp
M +4 -6 src/widgets/FilenameLayoutWidget.h
M +5 -1 src/widgets/MetaQueryWidget.cpp
http://commits.kde.org/amarok/5698b821796d977a309717a2ddc56dac39571589
diff --cc src/context/applets/wikipedia/WikipediaApplet.cpp
index d635f61,705b9db..59cc81a
--- a/src/context/applets/wikipedia/WikipediaApplet.cpp
+++ b/src/context/applets/wikipedia/WikipediaApplet.cpp
@@@ -417,8 -410,8 +414,8 @@@ WikipediaAppletPrivate::_getLangMap(
languageSettingsUi.progressBar->setMaximum( 100 );
languageSettingsUi.progressBar->setValue( 0 );
- KUrl url;
+ QUrl url;
- url.setScheme( "http" );
+ url.setScheme( "https" );
url.setHost( "en.wikipedia.org" );
url.setPath( "/w/api.php" );
url.addQueryItem( "action", "query" );
@@@ -804,10 -787,9 +799,9 @@@ WikipediaApplet::createConfigurationInt
QWidget *genSettings = new QWidget;
d->generalSettingsUi.setupUi( genSettings );
d->generalSettingsUi.mobileCheckBox->setCheckState( d->useMobileWikipedia ? Qt::Checked : Qt::Unchecked );
- d->generalSettingsUi.sslCheckBox->setCheckState( d->useSSL ? Qt::Checked : Qt::Unchecked );
connect( d->languageSettingsUi.downloadButton, SIGNAL(clicked()), this, SLOT(_getLangMap()) );
- connect( parent, SIGNAL(okClicked()), this, SLOT(_loadSettings()) );
+ connect( parent, SIGNAL(clicked()), this, SLOT(_loadSettings()) );
parent->addPage( genSettings, i18n( "Wikipedia General Settings" ), "configure" );
parent->addPage( langSettings, i18n( "Wikipedia Language Settings" ), "applications-education-language" );
diff --cc src/context/engines/tabs/TabsEngine.cpp
index 87bcd34,6c0504c..97b39cb
--- a/src/context/engines/tabs/TabsEngine.cpp
+++ b/src/context/engines/tabs/TabsEngine.cpp
@@@ -243,8 -243,8 +243,8 @@@ voi
TabsEngine::queryUltimateGuitar( const QString &artist, const QString &title )
{
// Query UltimateGuitar.com (filtering guitar (tabs + chords) and bass tabs)
- KUrl ultimateGuitarUrl;
+ QUrl ultimateGuitarUrl;
- ultimateGuitarUrl.setScheme( "http" );
+ ultimateGuitarUrl.setScheme( "https" );
ultimateGuitarUrl.setHost( "www.ultimate-guitar.com" );
ultimateGuitarUrl.setPath( "/search.php" );
ultimateGuitarUrl.addQueryItem( "view_state", "advanced" );
diff --cc src/context/engines/wikipedia/WikipediaEngine.cpp
index ca4ede6,d23a327..b3bb6b3
--- a/src/context/engines/wikipedia/WikipediaEngine.cpp
+++ b/src/context/engines/wikipedia/WikipediaEngine.cpp
@@@ -542,9 -530,9 +530,9 @@@ voi
WikipediaEnginePrivate::fetchWikiUrl( const QString &title, const QString &urlPrefix )
{
Q_Q( WikipediaEngine );
- KUrl pageUrl;
+ QUrl pageUrl;
QString host( ".wikipedia.org" );
- pageUrl.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
+ pageUrl.setScheme( QLatin1String( "https" ) );
if( useMobileVersion )
{
@@@ -581,8 -569,8 +569,8 @@@ WikipediaEnginePrivate::fetchLangLinks
const QString &llcontinue )
{
Q_Q( WikipediaEngine );
- KUrl url;
+ QUrl url;
- url.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
+ url.setScheme( QLatin1String( "https" ) );
url.setHost( hostLang + QLatin1String(".wikipedia.org") );
url.setPath( QLatin1String("/w/api.php") );
url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
@@@ -603,8 -591,8 +591,8 @@@ voi
WikipediaEnginePrivate::fetchListing( const QString &title, const QString &hostLang )
{
Q_Q( WikipediaEngine );
- KUrl url;
+ QUrl url;
- url.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
+ url.setScheme( QLatin1String( "https" ) );
url.setHost( hostLang + QLatin1String(".wikipedia.org") );
url.setPath( QLatin1String("/w/api.php") );
url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
diff --cc src/core-impl/collections/audiocd/AudioCdCollection.cpp
index 82e52d0,3af6e36..a8c8ac2
--- a/src/core-impl/collections/audiocd/AudioCdCollection.cpp
+++ b/src/core-impl/collections/audiocd/AudioCdCollection.cpp
@@@ -348,10 -348,32 +348,32 @@@ AudioCdCollection::checkForStartPlayReq
}
}
+
+ QString
+ AudioCdCollection::trackBaseFileName( int i ) const
+ {
+ return QString( "Track%1" ).arg( i, 2, 10, QChar('0') );
+ }
+
+
+ QString
+ AudioCdCollection::trackWavFileName( int i ) const
+ {
+ return trackBaseFileName( i ) + ".wav";
+ }
+
+
+ QString
+ AudioCdCollection::trackDisplayName( int i ) const
+ {
+ return i18n( "Track" ) + ' ' + QString::number( i );
+ }
+
+
qint64
- AudioCdCollection::trackLength(int i) const
+ AudioCdCollection::trackLength( int i ) const
{
- QUrl kioUrl = audiocdUrl( QString("Track%1.wav").arg(i, 2, 10, QChar('0') ) );
- KUrl kioUrl = audiocdUrl( trackWavFileName( i ) );
++ QUrl kioUrl = audiocdUrl( trackWavFileName( i ) );
KIO::UDSEntry uds;
if ( KIO::NetAccess::stat(kioUrl, uds, NULL) )
{
@@@ -482,19 -504,21 +504,21 @@@ AudioCdCollection::noInfoAvailable(
int i = 1;
- QString prefix( "0" );
- QString trackName = "Track " + prefix + QString::number( i );
+ QString trackWav = trackWavFileName( i );
- while( KIO::NetAccess::exists( KUrl( "audiocd:/" + trackName + ".wav" ), KIO::NetAccess::SourceSide, 0 ) )
+ // This will find also data tracks on mixed CDs:
+ // a better way to discover the available audio tracks should be found
+ while( KIO::NetAccess::exists( audiocdUrl( trackWav ), KIO::NetAccess::SourceSide, 0 ) )
{
- debug() << "got track: " << "audiocd:/" + trackName + ".wav";
+ debug() << "got track url: " << audiocdUrl( trackWav );
- QString baseUrl = "audiocd:/" + m_discCddbId + '/' + QString::number( i );
+ //we hack the url so the engine controller knows what track on the CD to play..
- KUrl baseUrl = audiocdUrl( m_discCddbId + '/' + QString::number( i ) );
++ QUrl baseUrl = audiocdUrl( m_discCddbId + '/' + QString::number( i ) );
- Meta::AudioCdTrackPtr trackPtr = Meta::AudioCdTrackPtr( new Meta::AudioCdTrack( this, trackName, QUrl(baseUrl) ) );
+ Meta::AudioCdTrackPtr trackPtr = Meta::AudioCdTrackPtr( new Meta::AudioCdTrack( this, trackDisplayName( i ), baseUrl ) );
trackPtr->setTrackNumber( i );
- trackPtr->setFileNameBase( trackName );
+ trackPtr->setFileNameBase( trackBaseFileName( i ) );
trackPtr->setLength( trackLength( i ) );
memoryCollection()->addTrack( Meta::TrackPtr::staticCast( trackPtr ) );
diff --cc src/core-impl/collections/audiocd/AudioCdCollection.h
index 08a43fe,e829368..4c942e0
--- a/src/core-impl/collections/audiocd/AudioCdCollection.h
+++ b/src/core-impl/collections/audiocd/AudioCdCollection.h
@@@ -102,7 -102,14 +102,14 @@@ private
void readAudioCdSettings();
// Helper function to build the audiocd url.
- KUrl audiocdUrl( const QString &path = "" ) const;
+ QUrl audiocdUrl( const QString &path = "" ) const;
+ // The file name of the track without extension
+ QString trackBaseFileName( int i ) const;
+ // The file name of the track in .wav format
+ QString trackWavFileName( int i ) const;
+ // The name of the track that should be displayed
+ QString trackDisplayName( int i ) const;
+ // The length of the track in milliseconds
qint64 trackLength( int i ) const;
/**
diff --cc src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
index 52b4707,4c618fc..faf0a17
--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
@@@ -18,17 -18,20 +18,20 @@@ target_link_libraries(amarok_collection
amarok-sqlcollection
amarokcore
amaroklib
- ${KDE4_KDECORE_LIBS}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
+ KF5::KDELibs4Support
+ Qt5::Core
+ Qt5::Gui
- ${MYSQL_EMBEDDED_LIBRARIES}
${CMAKE_DL_LIBS}
${ZLIB_LIBRARIES}
)
+ if(WITH_MYSQL_EMBEDDED)
+ target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
+ endif(WITH_MYSQL_EMBEDDED)
+
if(NOT WIN32 AND NOT APPLE)
target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
-endif(NOT WIN32 AND NOT APPLE)
+endif()
if(APPLE)
SET_TARGET_PROPERTIES(amarok_collection-mysqlcollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
diff --cc src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
index 8330c3d,e327354..6997b45
--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
@@@ -28,8 -28,9 +28,9 @@@
#include "playlist/PlaylistModelStack.h"
using namespace Playlists;
+ using namespace Playlist;
-XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
+XSPFPlaylist::XSPFPlaylist( const QUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
: PlaylistFile( url, provider )
, QDomDocument()
, m_autoAppendAfterLoad( onLoad == AppendToPlaylist )
diff --cc src/scripting/scriptconsole/ScriptConsole.cpp
index 779bebc,e4e0fab..a34a299
--- a/src/scripting/scriptconsole/ScriptConsole.cpp
+++ b/src/scripting/scriptconsole/ScriptConsole.cpp
@@@ -156,7 -161,7 +156,7 @@@ ScriptConsole::ScriptConsole( QWidget *
settings.endGroup();
if( m_savePath.isEmpty() )
- m_savePath = QUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path();
- m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path();
++ m_savePath = QUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path();
slotNewScript();
connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) );
diff --cc src/widgets/FilenameLayoutWidget.h
index c29aba9,8f6e35a..62c846a
--- a/src/widgets/FilenameLayoutWidget.h
+++ b/src/widgets/FilenameLayoutWidget.h
@@@ -78,11 -77,10 +77,10 @@@ class AMAROK_EXPORT FilenameLayoutWidge
void setScheme( const QString &scheme );
-
- public slots:
+ public Q_SLOTS:
virtual void onAccept();
- signals:
+ Q_SIGNALS:
/** emitted when either the scheme, option checkboxes or the replace edits change */
void schemeChanged();
More information about the Amarok-devel
mailing list