From 57aea111c80b6f694fae794bab3d300736ffbaa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 7 Mar 2009 21:30:19 +0200 Subject: [PATCH] Qt4: remove intf_UserFatal back-end --- modules/gui/qt4/dialogs/interaction.cpp | 15 +-------------- modules/gui/qt4/dialogs_provider.cpp | 3 +-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp index c2cfeb89c6..7b9ab6dfc9 100644 --- a/modules/gui/qt4/dialogs/interaction.cpp +++ b/modules/gui/qt4/dialogs/interaction.cpp @@ -48,20 +48,7 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf, dialog = NULL; altButton = NULL; - if( p_dialog->i_flags & DIALOG_BLOCKING_ERROR ) - { - i_ret = QMessageBox::critical( NULL, qfu( p_dialog->psz_title ), - qfu( p_dialog->psz_description ), - QMessageBox::Ok, QMessageBox::Ok ); - } - else if( p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) - { - if( config_GetInt( p_intf, "qt-error-dialogs" ) != 0 ) - ErrorsDialog::getInstance( p_intf )->addError( - qfu( p_dialog->psz_title ), qfu( p_dialog->psz_description ) ); - i_ret = QMessageBox::AcceptRole; - } - else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL ) + if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL ) { p_dialog->i_status = SENT_DIALOG; diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index bf0246d470..59f1af3a84 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -714,8 +714,7 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) case INTERACT_DESTROY: msg_Dbg( p_intf, "Destroy the Interaction Dialog" ); qdialog = (InteractionDialog*)(p_dialog->p_private); - if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) - delete qdialog; + delete qdialog; p_dialog->i_status = DESTROYED_DIALOG; break; } -- 2.39.5