[vlc-devel] commit: Fix a BIG memleak in Qt interface ( this poor object was missing his parent). ( Rémi Duraffort )
git version control
git at videolan.org
Sat Sep 6 00:27:03 CEST 2008
vlc | branch: 0.9-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Sep 5 22:17:38 2008 +0200| [f06973e49af673790fc03ee99a8975c06b39a448] | committer: Jean-Baptiste Kempf
Fix a BIG memleak in Qt interface (this poor object was missing his parent).
(cherry picked from commit 8cebd56a88006dfada190fe54b36ddbe2e25178d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f06973e49af673790fc03ee99a8975c06b39a448
---
modules/gui/qt4/menus.cpp | 2 +-
modules/gui/qt4/menus.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 35ebb97..86f9a5e 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1272,7 +1272,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
action->setChecked( checked );
- MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
+ MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, i_object_id, i_val_type,
val, psz_var );
CONNECT( action, triggered(), THEDP->menusMapper, map() );
THEDP->menusMapper->setMapping( action, itemData );
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index d1f8f5d..e796c46 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -50,7 +50,7 @@ class MenuItemData : public QObject
Q_OBJECT
public:
- MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
+ MenuItemData( QObject* parent, int i_id, int _i_type, vlc_value_t _val, const char *_var ) : QObject( parent )
{
i_object_id = i_id;
i_val_type = _i_type;
More information about the vlc-devel
mailing list