[vlc-commits] [Git][videolan/vlc][master] 3 commits: qt: PodcastConfiguration inherits QDialog not QWidget

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
183acaec by KO Myung-Hun at 2023-03-07T10:41:50+00:00
qt: PodcastConfiguration inherits QDialog not QWidget

Especially, accept() and reject() slots are in QDialog.

- - - - -
b59976a5 by KO Myung-Hun at 2023-03-07T10:41:50+00:00
skins2: os2: fix compilation

- - - - -
349a2ab6 by KO Myung-Hun at 2023-03-07T10:41:50+00:00
qt: disable code paths for unix style dvd list on OS/2

- - - - -


4 changed files:

- modules/gui/qt/dialogs/podcast/podcast_configuration.ui
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/skins2/os2/os2_loop.cpp
- modules/gui/skins2/os2/os2_loop.hpp


Changes:

=====================================
modules/gui/qt/dialogs/podcast/podcast_configuration.ui
=====================================
@@ -1,6 +1,6 @@
 <ui version="4.0" >
  <class>PodcastConfiguration</class>
- <widget class="QWidget" name="PodcastConfiguration" >
+ <widget class="QDialog" name="PodcastConfiguration" >
   <property name="geometry" >
    <rect>
     <x>0</x>


=====================================
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=====================================
@@ -667,7 +667,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
                 free( dvd_discpath );
                 free( vcd_discpath );
             }
-#ifndef _WIN32
+#if !defined( _WIN32 ) && !defined( __OS2__)
             QStringList DVDDeviceComboBoxStringList = QStringList();
             DVDDeviceComboBoxStringList
                     << "dvd*" << "scd*" << "sr*" << "sg*" << "cd*";


=====================================
modules/gui/skins2/os2/os2_loop.cpp
=====================================
@@ -76,26 +76,18 @@ OS2Loop::OS2Loop( intf_thread_t *pIntf ): OSLoop( pIntf )
 }
 
 
-OS2Loop::~OS2Loop()
-{
-}
-
-
 OSLoop *OS2Loop::instance( intf_thread_t *pIntf )
 {
     if( pIntf->p_sys->p_osLoop == NULL )
-    {
-        OSLoop *pOsLoop = new OS2Loop( pIntf );
-        pIntf->p_sys->p_osLoop = pOsLoop;
-    }
-    return pIntf->p_sys->p_osLoop;
+        pIntf->p_sys->p_osLoop = std::make_unique<OS2Loop>(pIntf);
+    return pIntf->p_sys->p_osLoop.get();
 }
 
 
 void OS2Loop::destroy( intf_thread_t *pIntf )
 {
-    delete pIntf->p_sys->p_osLoop;
-    pIntf->p_sys->p_osLoop = NULL;
+    assert(pIntf->p_sys->p_osLoop);
+    pIntf->p_sys->p_osLoop.reset();
 }
 
 


=====================================
modules/gui/skins2/os2/os2_loop.hpp
=====================================
@@ -42,6 +42,8 @@ public:
     /// Destroy the instance of OS2Loop
     static void destroy( intf_thread_t *pIntf );
 
+    OS2Loop( intf_thread_t *pIntf );
+
     /// Enter the event loop
     virtual void run();
 
@@ -53,10 +55,6 @@ public:
                                            MPARAM mp1, MPARAM mp2 );
 
 private:
-    // Private because it is a singleton
-    OS2Loop( intf_thread_t *pIntf );
-    virtual ~OS2Loop();
-
     /// Map associating special (i.e. non ascii) virtual key codes with
     /// internal vlc key codes
     std::map<int, int> virtKeyToVlcKey;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f907ad15261c007895f3b720c84a4c68264fa20a...349a2ab650254e04d4318fba3ccce6dc222c570a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f907ad15261c007895f3b720c84a4c68264fa20a...349a2ab650254e04d4318fba3ccce6dc222c570a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance