Changeset 54c23b66191ff8c50c699b0b92bc0e1bc617924c

Show
Ignore:
Timestamp:
03/16/08 21:34:41 (6 months ago)
Author:
Rémi Duraffort <ivoire@videolan.org>
git-committer:
Rémi Duraffort <ivoire@videolan.org> 1205699681 +0100
git-parent:

[10b3d6f1a239ec17c16cdfca13b4f98051591f34]

git-author:
Rémi Duraffort <ivoire@videolan.org> 1205609162 +0100
Message:

Remove useless test before a delete.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/live555.cpp

    rbcddfd6 r54c23b6  
    531531    psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, 
    532532                                               &authenticator ); 
    533     if( psz_options ) delete [] psz_options; 
     533    delete [] psz_options; 
    534534 
    535535    p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, 

  • modules/gui/beos/VideoOutput.cpp

    r99fab90 r54c23b6  
    778778                    msg_Dbg( p_vout, "using single-buffered overlay" ); 
    779779                    bitmap_count = 2; 
    780                     if( bitmap[2] ) { delete bitmap[2]; bitmap[2] = NULL; } 
     780                    delete bitmap[2]; bitmap[2] = NULL; 
    781781                } 
    782782            } 
    …… 
    785785                msg_Dbg( p_vout, "using simple overlay" ); 
    786786                bitmap_count = 1; 
    787                 if( bitmap[1] ) { delete bitmap[1]; bitmap[1] = NULL; } 
     787                delete bitmap[1]; bitmap[1] = NULL; 
    788788            } 
    789789            break; 
    …… 
    791791        else 
    792792        { 
    793             if( bitmap[0] ) { delete bitmap[0]; bitmap[0] = NULL; } 
     793            delete bitmap[0]; bitmap[0] = NULL; 
    794794        } 
    795795    } 
    …… 
    830830VideoWindow::_FreeBuffers() 
    831831{ 
    832     if( bitmap[0] ) { delete bitmap[0]; bitmap[0] = NULL; } 
    833     if( bitmap[1] ) { delete bitmap[1]; bitmap[1] = NULL; } 
    834     if( bitmap[2] ) { delete bitmap[2]; bitmap[2] = NULL; } 
     832    delete bitmap[0]; bitmap[0] = NULL; 
     833    delete bitmap[1]; bitmap[1] = NULL; 
     834    delete bitmap[2]; bitmap[2] = NULL; 
    835835    fInitStatus = B_ERROR; 
    836836} 

  • modules/gui/qt4/dialogs/interaction.cpp

    r7326fad r54c23b6  
    198198InteractionDialog::~InteractionDialog() 
    199199{ 
    200 //    if( panel ) delete panel; 
    201     if( dialog ) delete dialog; 
     200//    delete panel; 
     201    delete dialog; 
    202202} 
    203203 

  • modules/gui/qt4/qt4.cpp

    ra418e6d r54c23b6  
    385385    /* Destroy first the main interface because it is connected to some slots 
    386386       in the MainInputManager */ 
    387     if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi; 
     387    delete p_intf->p_sys->p_mi; 
    388388 
    389389    /* Destroy then other windows, because some are connected to some slots 

  • modules/gui/wince/interface.cpp

    r0a52089 r54c23b6  
    117117Interface::~Interface() 
    118118{ 
    119     if( timer ) delete timer; 
    120     if( video ) delete video; 
     119    delete timer; 
     120    delete video; 
    121121} 
    122122 

  • modules/gui/wince/wince.cpp

    r99fab90 r54c23b6  
    274274 
    275275 end: 
    276     if( intf ) delete intf; 
     276    delete intf; 
    277277 
    278278#ifndef UNDER_CE 

  • modules/gui/wxwidgets/dialogs/messages.cpp

    r272e38a r54c23b6  
    103103{ 
    104104    /* Clean up */ 
    105     if( save_log_dialog ) delete save_log_dialog; 
    106  
     105    delete save_log_dialog; 
    107106    delete info_attr; 
    108107    delete err_attr; 

  • modules/gui/wxwidgets/interface.cpp

    r0a52089 r54c23b6  
    513513    PopEventHandler(true); 
    514514 
    515     if( video_window ) delete video_window; 
     515    delete video_window; 
    516516 
    517517/* wxCocoa pretends to support this, but at least 2.6.x doesn't */ 
    518518#ifndef __APPLE__ 
    519519#ifdef wxHAS_TASK_BAR_ICON 
    520     if( p_systray ) delete p_systray; 
     520    delete p_systray; 
    521521#endif 
    522522#endif 
    …… 
    525525    var_DelCallback( p_intf, "interaction", InteractCallback, this ); 
    526526 
    527     if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow; 
     527    delete p_intf->p_sys->p_wxwindow; 
    528528 
    529529 

  • modules/gui/wxwidgets/wxwidgets.cpp

    r7326fad r54c23b6  
    419419    { 
    420420         /* We need to manually clean up the dialogs class */ 
    421          if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow; 
     421         delete p_intf->p_sys->p_wxwindow; 
    422422    } 
    423423