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

List:       kde-commits
Subject:    [amarok] src/core-impl/collections/umscollection: UmsCollection: remove unused variables left from K
From:       Matěj_Laitl <matej () laitl ! cz>
Date:       2012-05-19 16:54:28
Message-ID: 20120519165428.244F6A60BB () git ! kde ! org
[Download RAW message or body]

Git commit 6fd7073258d6975cb519048f5f1bec3e41f7732e by Matěj Laitl.
Committed on 19/05/2012 at 14:59.
Pushed by laitl into branch 'master'.

UmsCollection: remove unused variables left from KConfig transition

M  +3    -7    src/core-impl/collections/umscollection/UmsCollection.cpp

http://commits.kde.org/amarok/6fd7073258d6975cb519048f5f1bec3e41f7732e

diff --git a/src/core-impl/collections/umscollection/UmsCollection.cpp \
b/src/core-impl/collections/umscollection/UmsCollection.cpp index e87b492..b94e575 \
                100644
--- a/src/core-impl/collections/umscollection/UmsCollection.cpp
+++ b/src/core-impl/collections/umscollection/UmsCollection.cpp
@@ -261,13 +261,7 @@ UmsCollection::init()
     m_mountPoint = storageAccess->filePath();
     debug() << "Mounted at: " << m_mountPoint;
 
-    //read .is_audio_player from filesystem
-    KUrl playerFilePath( m_mountPoint );
-    playerFilePath.addPath( s_settingsFileName );
-    QFile playerFile( playerFilePath.toLocalFile() );
-    //prevent BR 259849: no audio_folder key in .is_audio_player file.
-    m_musicPath = m_mountPoint;
-
+    // read .is_audio_player from filesystem
     KConfig config( m_mountPoint + "/" + s_settingsFileName, KConfig::SimpleConfig \
);  KConfigGroup entries = config.group( QString() ); // default group
     if( entries.hasKey( s_musicFolderKey ) )
@@ -285,6 +279,8 @@ UmsCollection::init()
     else if( !entries.keyList().isEmpty() )
         // config file exists, but has no s_musicFolderKey -> music should be \
disabled  m_musicPath = KUrl();
+    else
+        m_musicPath = m_mountPoint; // related BR 259849
     QString scheme = entries.readEntry( s_musicFilenameSchemeKey );
     m_musicFilenameScheme = !scheme.isEmpty() ? scheme : m_musicFilenameScheme;
     m_vfatSafe = entries.readEntry( s_vfatSafeKey, m_vfatSafe );


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