[vlc-commits] Qt: remove unneeded code

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 14 20:51:14 2011 +0200| [437c3166e9b077d6bcc01a1a90b8535d92e11fb9] | committer: Jean-Baptiste Kempf

Qt: remove unneeded code

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

 .../gui/qt4/components/playlist/playlist_item.cpp  |    7 ++-----
 .../gui/qt4/components/playlist/playlist_item.hpp  |    4 ++--
 modules/gui/qt4/main_interface_win32.cpp           |    4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index fe8ce9f..cb9bde3 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -73,15 +73,12 @@ PLItem::~PLItem()
     children.clear();
 }
 
-/* So far signal is always true.
-   Using signal false would not call PLModel... Why ?
- */
-void PLItem::insertChild( PLItem *item, int i_pos, bool signal )
+void PLItem::insertChild( PLItem *item, int i_pos )
 {
     children.insert( i_pos, item );
 }
 
-void PLItem::appendChild( PLItem *item, bool signal )
+void PLItem::appendChild( PLItem *item )
 {
     children.insert( children.count(), item );
 }
diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index bbde855..d36b19c 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -39,8 +39,8 @@ public:
 
     int row() const;
 
-    void insertChild( PLItem *, int pos, bool signal = true );
-    void appendChild( PLItem *item, bool signal = true );
+    void insertChild( PLItem *, int pos );
+    void appendChild( PLItem *item );
     void removeChild( PLItem * );
     void removeChildren();
     void takeChildAt( int );
diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp
index 002ea65..d57730b 100644
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -87,12 +87,12 @@ void MainInterface::createTaskBarButtons()
     {
         p_taskbl->vt->HrInit(p_taskbl);
 
-        if(himl = ImageList_Create( 20, //cx
+        if( (himl = ImageList_Create( 20, //cx
                         20, //cy
                         ILC_COLOR32,//flags
                         4,//initial nb of images
                         0//nb of images that can be added
-                        ))
+                        ) ) != NULL )
         {
             QPixmap img   = QPixmap(":/win7/prev");
             QPixmap img2  = QPixmap(":/win7/pause");