git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c3476e
)
FSC memory leaks
author
Rémi Denis-Courmont
<rdenis@simphalempin.com>
Tue, 10 Feb 2009 19:05:01 +0000
(21:05 +0200)
committer
Rémi Denis-Courmont
<rdenis@simphalempin.com>
Tue, 10 Feb 2009 19:05:19 +0000
(21:05 +0200)
modules/gui/qt4/components/controller.cpp
patch
|
blob
|
history
modules/gui/qt4/components/controller.hpp
patch
|
blob
|
history
modules/gui/qt4/components/controller_widget.hpp
patch
|
blob
|
history
modules/gui/qt4/main_interface.cpp
patch
|
blob
|
history
diff --git
a/modules/gui/qt4/components/controller.cpp
b/modules/gui/qt4/components/controller.cpp
index
1a4c5d4
..
f41037c
100644
(file)
--- a/
modules/gui/qt4/components/controller.cpp
+++ b/
modules/gui/qt4/components/controller.cpp
@@
-190,7
+190,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
switch( button )
{
case PLAY_BUTTON: {
switch( button )
{
case PLAY_BUTTON: {
- PlayButton *playButton = new PlayButton;
+ PlayButton *playButton = new PlayButton
( this )
;
setupButton( playButton );
BUTTON_SET_BAR( playButton );
CONNECT_MAP_SET( playButton, PLAY_ACTION );
setupButton( playButton );
BUTTON_SET_BAR( playButton );
CONNECT_MAP_SET( playButton, PLAY_ACTION );
@@
-200,7
+200,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case STOP_BUTTON:{
}
break;
case STOP_BUTTON:{
- QToolButton *stopButton = new QToolButton;
+ QToolButton *stopButton = new QToolButton
( this )
;
setupButton( stopButton );
CONNECT_MAP_SET( stopButton, STOP_ACTION );
BUTTON_SET_BAR( stopButton );
setupButton( stopButton );
CONNECT_MAP_SET( stopButton, STOP_ACTION );
BUTTON_SET_BAR( stopButton );
@@
-208,7
+208,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case OPEN_BUTTON:{
}
break;
case OPEN_BUTTON:{
- QToolButton *openButton = new QToolButton;
+ QToolButton *openButton = new QToolButton
( this )
;
setupButton( openButton );
CONNECT_MAP_SET( openButton, OPEN_ACTION );
BUTTON_SET_BAR( openButton );
setupButton( openButton );
CONNECT_MAP_SET( openButton, OPEN_ACTION );
BUTTON_SET_BAR( openButton );
@@
-216,7
+216,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case PREVIOUS_BUTTON:{
}
break;
case PREVIOUS_BUTTON:{
- QToolButton *prevButton = new QToolButton;
+ QToolButton *prevButton = new QToolButton
( this )
;
setupButton( prevButton );
CONNECT_MAP_SET( prevButton, PREVIOUS_ACTION );
BUTTON_SET_BAR( prevButton );
setupButton( prevButton );
CONNECT_MAP_SET( prevButton, PREVIOUS_ACTION );
BUTTON_SET_BAR( prevButton );
@@
-225,7
+225,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
break;
case NEXT_BUTTON:
{
break;
case NEXT_BUTTON:
{
- QToolButton *nextButton = new QToolButton;
+ QToolButton *nextButton = new QToolButton
( this )
;
setupButton( nextButton );
CONNECT_MAP_SET( nextButton, NEXT_ACTION );
BUTTON_SET_BAR( nextButton );
setupButton( nextButton );
CONNECT_MAP_SET( nextButton, NEXT_ACTION );
BUTTON_SET_BAR( nextButton );
@@
-233,7
+233,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case SLOWER_BUTTON:{
}
break;
case SLOWER_BUTTON:{
- QToolButton *slowerButton = new QToolButton;
+ QToolButton *slowerButton = new QToolButton
( this )
;
setupButton( slowerButton );
CONNECT_MAP_SET( slowerButton, SLOWER_ACTION );
BUTTON_SET_BAR( slowerButton );
setupButton( slowerButton );
CONNECT_MAP_SET( slowerButton, SLOWER_ACTION );
BUTTON_SET_BAR( slowerButton );
@@
-242,7
+242,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case FASTER_BUTTON:{
}
break;
case FASTER_BUTTON:{
- QToolButton *fasterButton = new QToolButton;
+ QToolButton *fasterButton = new QToolButton
( this )
;
setupButton( fasterButton );
CONNECT_MAP_SET( fasterButton, FASTER_ACTION );
BUTTON_SET_BAR( fasterButton );
setupButton( fasterButton );
CONNECT_MAP_SET( fasterButton, FASTER_ACTION );
BUTTON_SET_BAR( fasterButton );
@@
-251,7
+251,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case FRAME_BUTTON: {
}
break;
case FRAME_BUTTON: {
- QToolButton *frameButton = new QToolButton;
+ QToolButton *frameButton = new QToolButton
( this )
;
setupButton( frameButton );
CONNECT_MAP_SET( frameButton, FRAME_ACTION );
BUTTON_SET_BAR( frameButton );
setupButton( frameButton );
CONNECT_MAP_SET( frameButton, FRAME_ACTION );
BUTTON_SET_BAR( frameButton );
@@
-260,7
+260,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case FULLSCREEN_BUTTON:{
}
break;
case FULLSCREEN_BUTTON:{
- QToolButton *fullscreenButton = new QToolButton;
+ QToolButton *fullscreenButton = new QToolButton
( this )
;
setupButton( fullscreenButton );
CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
BUTTON_SET_BAR( fullscreenButton );
setupButton( fullscreenButton );
CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
BUTTON_SET_BAR( fullscreenButton );
@@
-269,7
+269,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case DEFULLSCREEN_BUTTON:{
}
break;
case DEFULLSCREEN_BUTTON:{
- QToolButton *fullscreenButton = new QToolButton;
+ QToolButton *fullscreenButton = new QToolButton
( this )
;
setupButton( fullscreenButton );
CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
BUTTON_SET_BAR( fullscreenButton )
setupButton( fullscreenButton );
CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
BUTTON_SET_BAR( fullscreenButton )
@@
-278,7
+278,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case EXTENDED_BUTTON:{
}
break;
case EXTENDED_BUTTON:{
- QToolButton *extSettingsButton = new QToolButton;
+ QToolButton *extSettingsButton = new QToolButton
( this )
;
setupButton( extSettingsButton );
CONNECT_MAP_SET( extSettingsButton, EXTENDED_ACTION );
BUTTON_SET_BAR( extSettingsButton )
setupButton( extSettingsButton );
CONNECT_MAP_SET( extSettingsButton, EXTENDED_ACTION );
BUTTON_SET_BAR( extSettingsButton )
@@
-286,7
+286,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case PLAYLIST_BUTTON:{
}
break;
case PLAYLIST_BUTTON:{
- QToolButton *playlistButton = new QToolButton;
+ QToolButton *playlistButton = new QToolButton
( this )
;
setupButton( playlistButton );
CONNECT_MAP_SET( playlistButton, PLAYLIST_ACTION );
BUTTON_SET_BAR( playlistButton );
setupButton( playlistButton );
CONNECT_MAP_SET( playlistButton, PLAYLIST_ACTION );
BUTTON_SET_BAR( playlistButton );
@@
-294,7
+294,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case SNAPSHOT_BUTTON:{
}
break;
case SNAPSHOT_BUTTON:{
- QToolButton *snapshotButton = new QToolButton;
+ QToolButton *snapshotButton = new QToolButton
( this )
;
setupButton( snapshotButton );
CONNECT_MAP_SET( snapshotButton, SNAPSHOT_ACTION );
BUTTON_SET_BAR( snapshotButton );
setupButton( snapshotButton );
CONNECT_MAP_SET( snapshotButton, SNAPSHOT_ACTION );
BUTTON_SET_BAR( snapshotButton );
@@
-303,7
+303,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case RECORD_BUTTON:{
}
break;
case RECORD_BUTTON:{
- QToolButton *recordButton = new QToolButton;
+ QToolButton *recordButton = new QToolButton
( this )
;
setupButton( recordButton );
CONNECT_MAP_SET( recordButton, RECORD_ACTION );
BUTTON_SET_BAR( recordButton );
setupButton( recordButton );
CONNECT_MAP_SET( recordButton, RECORD_ACTION );
BUTTON_SET_BAR( recordButton );
@@
-315,7
+315,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case ATOB_BUTTON: {
}
break;
case ATOB_BUTTON: {
- AtoB_Button *ABButton = new AtoB_Button;
+ AtoB_Button *ABButton = new AtoB_Button
( this )
;
setupButton( ABButton );
BUTTON_SET_BAR( ABButton );
ENABLE_ON_INPUT( ABButton );
setupButton( ABButton );
BUTTON_SET_BAR( ABButton );
ENABLE_ON_INPUT( ABButton );
@@
-361,7
+361,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
break;
case SPLITTER:
{
break;
case SPLITTER:
{
- QFrame *line = new QFrame;
+ QFrame *line = new QFrame
( this )
;
line->setFrameShape( QFrame::VLine );
line->setFrameShadow( QFrame::Raised );
line->setLineWidth( 0 );
line->setFrameShape( QFrame::VLine );
line->setFrameShadow( QFrame::Raised );
line->setLineWidth( 0 );
@@
-376,7
+376,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case REVERSE_BUTTON:{
}
break;
case REVERSE_BUTTON:{
- QToolButton *reverseButton = new QToolButton;
+ QToolButton *reverseButton = new QToolButton
( this )
;
setupButton( reverseButton );
CONNECT_MAP_SET( reverseButton, REVERSE_ACTION );
BUTTON_SET_BAR( reverseButton );
setupButton( reverseButton );
CONNECT_MAP_SET( reverseButton, REVERSE_ACTION );
BUTTON_SET_BAR( reverseButton );
@@
-385,7
+385,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case SKIP_BACK_BUTTON: {
}
break;
case SKIP_BACK_BUTTON: {
- QToolButton *skipBakButton = new QToolButton;
+ QToolButton *skipBakButton = new QToolButton
( this )
;
setupButton( skipBakButton );
CONNECT_MAP_SET( skipBakButton, SKIP_BACK_ACTION );
BUTTON_SET_BAR( skipBakButton );
setupButton( skipBakButton );
CONNECT_MAP_SET( skipBakButton, SKIP_BACK_ACTION );
BUTTON_SET_BAR( skipBakButton );
@@
-394,7
+394,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case SKIP_FW_BUTTON: {
}
break;
case SKIP_FW_BUTTON: {
- QToolButton *skipFwButton = new QToolButton;
+ QToolButton *skipFwButton = new QToolButton
( this )
;
setupButton( skipFwButton );
CONNECT_MAP_SET( skipFwButton, SKIP_FW_ACTION );
BUTTON_SET_BAR( skipFwButton );
setupButton( skipFwButton );
CONNECT_MAP_SET( skipFwButton, SKIP_FW_ACTION );
BUTTON_SET_BAR( skipFwButton );
@@
-403,7
+403,7
@@
QWidget *AbstractController::createWidget( buttonType_e button, int options )
}
break;
case QUIT_BUTTON: {
}
break;
case QUIT_BUTTON: {
- QToolButton *quitButton = new QToolButton;
+ QToolButton *quitButton = new QToolButton
( this )
;
setupButton( quitButton );
CONNECT_MAP_SET( quitButton, QUIT_ACTION );
BUTTON_SET_BAR( quitButton );
setupButton( quitButton );
CONNECT_MAP_SET( quitButton, QUIT_ACTION );
BUTTON_SET_BAR( quitButton );
@@
-480,7
+480,7
@@
QFrame *AbstractController::telexFrame()
/**
* Telextext QFrame
**/
/**
* Telextext QFrame
**/
- TeletextController *telexFrame = new TeletextController;
+ TeletextController *telexFrame = new TeletextController
( this )
;
QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
CONNECT( THEMIM->getIM(), teletextPossible( bool ),
QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
CONNECT( THEMIM->getIM(), teletextPossible( bool ),
@@
-625,8
+625,8
@@
InputControlsWidget::InputControlsWidget( intf_thread_t *_p_i, QWidget *_parent
/**********************************************************************
* Fullscrenn control widget
**********************************************************************/
/**********************************************************************
* Fullscrenn control widget
**********************************************************************/
-FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i )
- : AbstractController( _p_i )
+FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i
, QWidget *parent
)
+ : AbstractController( _p_i
, parent
)
{
i_mouse_last_x = -1;
i_mouse_last_y = -1;
{
i_mouse_last_x = -1;
i_mouse_last_y = -1;
diff --git
a/modules/gui/qt4/components/controller.hpp
b/modules/gui/qt4/components/controller.hpp
index
43e8f7c
..
db3fb9d
100644
(file)
--- a/
modules/gui/qt4/components/controller.hpp
+++ b/
modules/gui/qt4/components/controller.hpp
@@
-227,7
+227,7
@@
class FullscreenControllerWidget : public AbstractController
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- FullscreenControllerWidget( intf_thread_t * );
+ FullscreenControllerWidget( intf_thread_t *
, QWidget *parent
);
virtual ~FullscreenControllerWidget();
/* Vout */
virtual ~FullscreenControllerWidget();
/* Vout */
diff --git
a/modules/gui/qt4/components/controller_widget.hpp
b/modules/gui/qt4/components/controller_widget.hpp
index
8741b69
..
3bb7e49
100644
(file)
--- a/
modules/gui/qt4/components/controller_widget.hpp
+++ b/
modules/gui/qt4/components/controller_widget.hpp
@@
-51,6
+51,8
@@
class QAbstractSlider;
class PlayButton : public QToolButton
{
Q_OBJECT
class PlayButton : public QToolButton
{
Q_OBJECT
+public:
+ PlayButton( QWidget *parent ) : QToolButton( parent ) { }
private slots:
void updateButton( bool );
};
private slots:
void updateButton( bool );
};
@@
-58,6
+60,8
@@
private slots:
class AtoB_Button : public QToolButton
{
Q_OBJECT
class AtoB_Button : public QToolButton
{
Q_OBJECT
+public:
+ AtoB_Button( QWidget *parent ) : QToolButton( parent ) { }
private slots:
void setIcons( bool, bool );
};
private slots:
void setIcons( bool, bool );
};
@@
-66,6
+70,10
@@
class TeletextController : public QFrame
{
Q_OBJECT
friend class AbstractController;
{
Q_OBJECT
friend class AbstractController;
+
+public:
+ TeletextController( QWidget *parent ) : QFrame( parent ) { }
+
private:
QToolButton *telexTransparent, *telexOn;
QSpinBox *telexPage;
private:
QToolButton *telexTransparent, *telexOn;
QSpinBox *telexPage;
diff --git
a/modules/gui/qt4/main_interface.cpp
b/modules/gui/qt4/main_interface.cpp
index
5f8de7e
..
ee799eb
100644
(file)
--- a/
modules/gui/qt4/main_interface.cpp
+++ b/
modules/gui/qt4/main_interface.cpp
@@
-436,7
+436,7
@@
void MainInterface::handleMainUi( QSettings *settings )
/* Create the FULLSCREEN CONTROLS Widget */
if( config_GetInt( p_intf, "qt-fs-controller" ) )
{
/* Create the FULLSCREEN CONTROLS Widget */
if( config_GetInt( p_intf, "qt-fs-controller" ) )
{
- fullscreenControls = new FullscreenControllerWidget( p_intf );
+ fullscreenControls = new FullscreenControllerWidget( p_intf
, this
);
}
}
}
}