From a39d17557548830bc00df44ba7b71a778ddd5853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 8 Sep 2021 17:17:58 +0300 Subject: [PATCH] Revert "qt: Added firstrun wizard into MainInterface" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3895e912bffaed9f99a5f657272f307f2251791d. This broke the test suite: [00007f6d0c000f20] idummy access: command `nop' vlc: ../../modules/gui/qt/dialogs/firstrun/firstrunwizard.cpp :308 : virtual void FirstRunWizard::reject(): l'assertion « p_intf->p_mi » a échoué. Aborted --- modules/gui/qt/dialogs/dialogs_provider.cpp | 8 -------- modules/gui/qt/dialogs/dialogs_provider.hpp | 1 - modules/gui/qt/maininterface/main_interface.cpp | 8 -------- 3 files changed, 17 deletions(-) diff --git a/modules/gui/qt/dialogs/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp index 4bd318da34..d2aa9b1182 100644 --- a/modules/gui/qt/dialogs/dialogs_provider.cpp +++ b/modules/gui/qt/dialogs/dialogs_provider.cpp @@ -54,7 +54,6 @@ #include "dialogs/epg/epg.hpp" #include "dialogs/errors/errors.hpp" #include "dialogs/playlists/playlists.hpp" -#include "dialogs/firstrun/firstrunwizard.hpp" #include #include @@ -263,13 +262,6 @@ void DialogsProvider::prefsDialog() p->toggleVisible(); } -void DialogsProvider::firstRunDialog() -{ - FirstRunWizard *p = new FirstRunWizard( p_intf ); - QVLCDialog::setWindowTransientParent(p, nullptr, p_intf); - p->show(); -} - void DialogsProvider::extendedDialog() { ExtendedDialog *extDialog = ExtendedDialog::getInstance(p_intf ); diff --git a/modules/gui/qt/dialogs/dialogs_provider.hpp b/modules/gui/qt/dialogs/dialogs_provider.hpp index 4aa765ceb4..0a111d67f7 100644 --- a/modules/gui/qt/dialogs/dialogs_provider.hpp +++ b/modules/gui/qt/dialogs/dialogs_provider.hpp @@ -136,7 +136,6 @@ public slots: void mediaInfoDialog( const PlaylistItem& pItem ); void mediaCodecDialog(); void prefsDialog(); - void firstRunDialog(); void extendedDialog(); void synchroDialog(); void messagesDialog(); diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp index 6d2a0a2863..9c1b760d68 100644 --- a/modules/gui/qt/maininterface/main_interface.cpp +++ b/modules/gui/qt/maininterface/main_interface.cpp @@ -206,14 +206,6 @@ MainInterface::MainInterface(qt_intf_t *_p_intf) /* Register callback for the intf-popupmenu variable */ var_AddCallback( libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); - - if( config_GetInt("qt-privacy-ask") ) - { - //postpone dialog call, as composition might not be ready yet - QMetaObject::invokeMethod(this, [this](){ - THEDP->firstRunDialog(); - }, Qt::QueuedConnection); - } } MainInterface::~MainInterface()