[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: qt: fix qt-error-dialogs inherit type

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
904e9cd7 by Steve Lhomme at 2021-10-15T14:50:22+02:00
qt: fix qt-error-dialogs inherit type

Running the (3.0) code with --no-qt-error-dialogs asserts.

(cherry picked from commit 0733018f8a5346e711dc549d1ba9a46e25af9c43) (edited)
edited:
- on 3.0 the files are not in a dialog subfolder

- - - - -
14a4dc04 by Steve Lhomme at 2021-10-15T14:50:24+02:00
qt: fix compilation with --disable-update-check

The "ifdef" doesn't seem to be taken in account. It's as if the define was
always set. Now that the define is properly used we need to pass it to moc.

(cherry picked from commit 568aba0b02e803afcbaceff5beece882f10d4fce) (edited)
edited:
- on 3.0 the files are not in a dialog subfolder

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


3 changed files:

- modules/gui/qt/dialogs/errors.cpp
- modules/gui/qt/dialogs/help.hpp
- modules/gui/qt/dialogs_provider.hpp


Changes:

=====================================
modules/gui/qt/dialogs/errors.cpp
=====================================
@@ -52,7 +52,7 @@ ErrorsDialog::ErrorsDialog( intf_thread_t *_p_intf )
     messages->setReadOnly( true );
     messages->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     stopShowing = new QCheckBox( qtr( "Hide future errors" ) );
-    stopShowing->setChecked( var_InheritInteger( p_intf, "qt-error-dialogs" ) != 0 );
+    stopShowing->setChecked( var_InheritBool( p_intf, "qt-error-dialogs" ) );
 
     layout->addWidget( messages, 0, 0, 1, 3 );
     layout->addWidget( stopShowing, 1, 0 );
@@ -81,7 +81,7 @@ void ErrorsDialog::add( bool error, const QString& title, const QString& text )
     messages->setTextColor( "black" );
     messages->insertPlainText( text + QString( "\n" ) );
     messages->ensureCursorVisible();
-    if ( var_InheritInteger( p_intf, "qt-error-dialogs" ) != 0 )
+    if ( var_InheritBool( p_intf, "qt-error-dialogs" ) )
         show();
 }
 


=====================================
modules/gui/qt/dialogs/help.hpp
=====================================
@@ -73,7 +73,7 @@ private slots:
     void showCredit();
 };
 
-#ifdef UPDATE_CHECK
+#if defined(UPDATE_CHECK)
 
 class UpdateDialog : public QVLCFrame, public Singleton<UpdateDialog>
 {


=====================================
modules/gui/qt/dialogs_provider.hpp
=====================================
@@ -139,7 +139,7 @@ public slots:
     void vlmDialog();
 #endif
     void helpDialog();
-#ifdef UPDATE_CHECK
+#if defined(UPDATE_CHECK)
     void updateDialog();
 #endif
     void aboutDialog();



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1f870b73e0e65901b42a1fcf33dbb031c9a1e163...14a4dc04a504638936e28237a70fbf858b84bf7b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1f870b73e0e65901b42a1fcf33dbb031c9a1e163...14a4dc04a504638936e28237a70fbf858b84bf7b
You're receiving this email because of your account on code.videolan.org.