refactoring

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3586 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 15 insertions, 33 deletions

diff --git a/src/qmmpui/playlistgroup.cpp b/src/qmmpui/playlistgroup.cpp
index 1d33e8ec6..f6c7c943a 100644
--- a/src/qmmpui/playlistgroup.cpp
+++ b/src/qmmpui/playlistgroup.cpp
@@ -44,7 +44,7 @@ PlayListGroup::~PlayListGroup()
     }
 }
 
-const QString PlayListGroup::formattedTitle() const
+const QString PlayListGroup::formattedTitle()
 {
     return m_name;
 }
diff --git a/src/qmmpui/playlistgroup.h b/src/qmmpui/playlistgroup.h
index 698cf0a6c..e6c5b119a 100644
--- a/src/qmmpui/playlistgroup.h
+++ b/src/qmmpui/playlistgroup.h
@@ -34,7 +34,7 @@ public:
     int firstIndex;
     int lastIndex;
 
-    const QString formattedTitle() const;
+    const QString formattedTitle();
     void addTrack(PlayListTrack *track);
     bool contains(PlayListTrack *track) const;
     bool isEmpty() const;
@@ -49,7 +49,7 @@ public:
     /*!
      *  Returns formatted length of the item.
      */
-    const QString formattedLength() const { return QString(); }
+    const QString formattedLength() { return QString(); }
 
     virtual bool isGroup() const { return true; }
 
diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h
index 301442e14..8708b9d69 100644
--- a/src/qmmpui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
@@ -52,11 +52,11 @@ public:
     /*!
      * Returns formatted title of the item.
      */
-    virtual const QString formattedTitle() const = 0;
+    virtual const QString formattedTitle() = 0;
     /*!
      *  Returns formatted length of the item.
      */
-    virtual const QString formattedLength() const = 0;
+    virtual const QString formattedLength() = 0;
 
     virtual bool isGroup() const = 0;
 
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 888615834..7c537b1ec 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -109,7 +109,6 @@ void PlayListModel::add(QList<PlayListTrack *> tracks)
     foreach(PlayListTrack *track, tracks)
     {
         m_container.addTrack(track);
-        track->readMetadata();
         m_total_length += track->length();
         emit itemAdded(track);
     }
diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp
index ad84b53b4..f156c5368 100644
--- a/src/qmmpui/playlisttrack.cpp
+++ b/src/qmmpui/playlisttrack.cpp
@@ -48,7 +48,6 @@ PlayListTrack::PlayListTrack(FileInfo *info) :  QMap<Qmmp::MetaData, QString>(in
     setLength(m_length = info->length());
     m_info = info;
     insert(Qmmp::URL, m_info->path());
-    readMetadata();
 }
 
 PlayListTrack::~PlayListTrack()
@@ -63,7 +62,7 @@ void PlayListTrack::updateMetaData(const QMap <Qmmp::MetaData, QString> &metaDat
     readMetadata();
 }
 
-void PlayListTrack::updateTags()
+void PlayListTrack::updateMetaData()
 {
     if (m_info)
     {
@@ -94,23 +93,18 @@ bool PlayListTrack::isGroup() const
     return false;
 }
 
-const QString PlayListTrack::formattedTitle() const
+const QString PlayListTrack::formattedTitle()
 {
-    /*if(m_formattedTitle.isEmpty())
-        readMetadata();*/
+    if(m_formattedTitle.isEmpty())
+        readMetadata();
     return m_formattedTitle;
 }
 
-const QString PlayListTrack::formattedLength() const
+const QString PlayListTrack::formattedLength()
 {
     return m_formattedLength;
 }
 
-void PlayListTrack::setText(const QString &title)
-{
-    m_formattedTitle = title;
-}
-
 qint64 PlayListTrack::length() const
 {
     return m_length;
diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h
index 218d6a978..d2cd5416c 100644
--- a/src/qmmpui/playlisttrack.h
+++ b/src/qmmpui/playlisttrack.h
@@ -26,10 +26,6 @@
 #include "playlistitem.h"
 
 
-//PlayListItem
-//PlayListTrack
-//PlayListGroup
-
 /** @brief The PlayListTrack class provides an item for use with the PlayListModel class.
  * @author Ilya Kotov <forkotov02@hotmail.ru>
  */
@@ -69,16 +65,11 @@ public:
     /*!
      * Returns formatted title of the item.
      */
-    const QString formattedTitle() const;
+    const QString formattedTitle();
     /*!
      *  Returns formatted length of the item.
      */
-    const QString formattedLength() const;
-    /*!
-     * Direct access to the item short title.
-     * @param title New short title.
-     */
-    void setText(const QString &title);
+    const QString formattedLength();
     /*!
      * Returns song length in seconds.
      */
@@ -99,7 +90,7 @@ public:
     /*!
      * Gets new metadata from file (works for local files only).
      */
-    void updateTags();
+    void updateMetaData();
 
     const QString groupName() const;
 
@@ -114,10 +105,8 @@ public:
      */
     void setFlag(FLAGS);
 
-    void readMetadata();
-
 private:
-
+    void readMetadata();
     QString m_formattedTitle;
     QString m_formattedLength;
     FileInfo *m_info;
diff --git a/src/qmmpui/tagupdater.cpp b/src/qmmpui/tagupdater.cpp
index 261e16cc2..0b50e83cc 100644
--- a/src/qmmpui/tagupdater.cpp
+++ b/src/qmmpui/tagupdater.cpp
@@ -36,7 +36,7 @@ void TagUpdater::updateTag()
     }
     else
     {
-        m_item->updateTags();
+        m_item->updateMetaData();
         m_item->setFlag(PlayListTrack::FREE);
     }
 }