]> git.sesse.net Git - vlc/commitdiff
Qt4: remove intf_UserFatal back-end
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 7 Mar 2009 19:30:19 +0000 (21:30 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 7 Mar 2009 19:30:19 +0000 (21:30 +0200)
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs_provider.cpp

index c2cfeb89c6b746c2ab5bb0918e0c9e0c51f87d72..7b9ab6dfc91309e670bc6c98f9d1ca2edd268b2d 100644 (file)
@@ -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;
 
index bf0246d4707dc6744616c219c7ab67526e0934dc..59f1af3a84f79a793a6303c34b1e7b852bd14225 100644 (file)
@@ -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;
     }