videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

intf_UserWarn: remove dead code

This commit is contained in:
Rémi Denis-Courmont 2009-03-05 23:20:42 +02:00
parent 70e58dfa8e
commit 91082b5bd5
7 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/vlc_interface.h
View File

@ -236,7 +236,6 @@ struct interaction_dialog_t
#define DIALOG_PSZ_INPUT_OK_CANCEL 0x08
#define DIALOG_BLOCKING_ERROR 0x10
#define DIALOG_NONBLOCKING_ERROR 0x20
#define DIALOG_WARNING 0x40
#define DIALOG_USER_PROGRESS 0x80
#define DIALOG_INTF_PROGRESS 0x100
@ -282,8 +281,6 @@ enum
#define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e )
VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, bool, const char*, const char*, ...) LIBVLC_FORMAT( 4, 5 ) );
#define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e )
VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) LIBVLC_FORMAT( 3, 4 ) );
#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) );
#define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )

6
modules/gui/macosx/interaction.m
View File

@ -182,12 +182,6 @@
[[[[VLCMain sharedInstance] getInteractionList] getErrorPanel]
addError: o_title withMsg: o_description];
}
else if( p_dialog->i_flags & DIALOG_WARNING )
{
msg_Dbg( p_intf, "addition to non-blocking warning panel received" );
[[[[VLCMain sharedInstance] getInteractionList] getErrorPanel]
addWarning: o_title withMsg: o_description];
}
else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
{
msg_Dbg( p_intf, "yes-no-cancel-dialog requested" );

4
modules/gui/qt4/dialogs/errors.cpp
View File

@ -72,10 +72,10 @@ void ErrorsDialog::addError( QString title, QString text )
add( true, title, text );
}
void ErrorsDialog::addWarning( QString title, QString text )
/*void ErrorsDialog::addWarning( QString title, QString text )
{
add( false, title, text );
}
}*/
void ErrorsDialog::add( bool error, QString title, QString text )
{

2
modules/gui/qt4/dialogs/errors.hpp
View File

@ -44,7 +44,7 @@ public:
virtual ~ErrorsDialog() {};
void addError( QString, QString );
void addWarning( QString, QString );
/*void addWarning( QString, QString );*/
private:
ErrorsDialog( QWidget *parent, intf_thread_t * );
static ErrorsDialog *instance;

7
modules/gui/qt4/dialogs/interaction.cpp
View File

@ -61,13 +61,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
qfu( p_dialog->psz_title ), qfu( p_dialog->psz_description ) );
i_ret = QMessageBox::AcceptRole;
}
else if( p_dialog->i_flags & DIALOG_WARNING )
{
if( config_GetInt( p_intf, "qt-error-dialogs" ) != 0 )
ErrorsDialog::getInstance( p_intf )->addWarning(
qfu( p_dialog->psz_title ),qfu( p_dialog->psz_description ) );
i_ret = QMessageBox::AcceptRole;
}
else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
{
p_dialog->i_status = SENT_DIALOG;

23
src/interface/interaction.c
View File

@ -124,29 +124,6 @@ int __intf_UserFatal( vlc_object_t *p_this, bool b_blocking,
return DialogFireForget( p_new );
}
/**
* Helper function to send a warning, which is always shown non-blocking
*
* \param p_this Parent vlc_object
* \param psz_title Title for the dialog
* \param psz_format The message to display
* \return VLC_SUCCESS or VLC_EGENERIC
*/
int __intf_UserWarn( vlc_object_t *p_this,
const char *psz_title,
const char *psz_format, ... )
{
va_list args;
DIALOG_INIT( ONEWAY, VLC_EGENERIC );
p_new->psz_title = strdup( psz_title );
FORMAT_DESC;
p_new->i_flags = DIALOG_WARNING;
return DialogFireForget( p_new );
}
/**
* Helper function to ask a yes-no-cancel question
*

1
src/libvlccore.sym
View File

@ -202,7 +202,6 @@ __intf_UserFatal
intf_UserHide
__intf_UserLoginPassword
__intf_UserStringInput
__intf_UserWarn
__intf_UserYesNo
IsUTF8
libvlc_InternalAddIntf