[vlc-devel] commit: Qt4: PLItem cleanup (Ilkka Ollakka )

git version control git at videolan.org
Thu Aug 13 18:07:05 CEST 2009


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Thu Aug 13 19:02:36 2009 +0300| [7475606adfd94d412a972d64adec5e31e96c060b] | committer: Ilkka Ollakka 

Qt4: PLItem cleanup

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7475606adfd94d412a972d64adec5e31e96c060b
---

 .../gui/qt4/components/playlist/playlist_item.cpp  |   16 ----------------
 .../gui/qt4/components/playlist/playlist_item.hpp  |    2 --
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index 2af82d1..f0c1414 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -77,20 +77,17 @@ void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent, PLModel *m,
             else if ( i_showflags >= COLUMN_END )
                 i_showflags = COLUMN_END - 1; /* show everything */
 
-            updateColumnHeaders();
         }
     }
     else
     {
         i_showflags = parentItem->i_showflags;
-        //Add empty string and update() handles data appending
     }
 }
 
 /*
    Constructors
    Call the above function init
-   So far the first constructor isn't used...
    */
 PLItem::PLItem( playlist_item_t *p_item, PLItem *parent, PLModel *m )
 {
@@ -109,12 +106,6 @@ PLItem::~PLItem()
     children.clear();
 }
 
-/* Column manager */
-void PLItem::updateColumnHeaders()
-{
-    assert( i_showflags < COLUMN_END );
-}
-
 /* So far signal is always true.
    Using signal false would not call PLModel... Why ?
  */
@@ -149,13 +140,6 @@ int PLItem::row() const
 }
 
 /* update the PL Item, get the good names and so on */
-/* This function may not be the best way to do it
-   It destroys everything and gets everything again instead of just
-   building the necessary columns.
-   This does extra work if you re-display the same column. Slower...
-   On the other hand, this way saves memory.
-   There must be a more clever way.
-   */
 void PLItem::update( playlist_item_t *p_item, bool iscurrent )
 {
     assert( p_item->p_input->i_id == i_input_id );
diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index daa831a..74d83fb 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -40,7 +40,6 @@ class PLItem
 {
     friend class PLModel;
 public:
-    PLItem( int, int, bool, PLItem *parent , PLModel * );
     PLItem( playlist_item_t *, PLItem *parent, PLModel * );
     PLItem( playlist_item_t *, QSettings *, PLModel * );
     ~PLItem();
@@ -74,7 +73,6 @@ protected:
 
 private:
     void init( playlist_item_t *, PLItem *, PLModel *, QSettings * );
-    void updateColumnHeaders();
     PLItem *parentItem;
     PLModel *model;
 };




More information about the vlc-devel mailing list