Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
04507065 by Fatih Uzunoglu at 2024-10-28T05:11:02+00:00
qt: use QT_USE_QSTRINGBUILDER
- - - - -
4 changed files:
- modules/gui/qt/Makefile.am
- modules/gui/qt/dialogs/help/help.cpp
- modules/gui/qt/dialogs/sout/convert.cpp
- modules/gui/qt/meson.build
Changes:
=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -27,6 +27,7 @@ vlc_qt_check_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_qt) \
-DQT_STRICT_ITERATORS \
+ -DQT_USE_QSTRINGBUILDER \
-I$(srcdir) -I$(builddir) \
-I$(builddir)/dialogs/extended \
-I$(builddir)/dialogs/fingerprint \
=====================================
modules/gui/qt/dialogs/help/help.cpp
=====================================
@@ -389,7 +389,7 @@ void UpdateDialog::updateUI( )
.arg( m_model->getMajor() )
.arg( m_model->getMinor() )
.arg( m_model->getRevision() )
- .arg( extra == 0 ? "" : "." + QString::number(
extra ) );
+ .arg( extra == 0 ? QStringLiteral("") :
QStringLiteral(".") + QString::number( extra ) );
ui.updateNotifyLabel->setText( message );
message = m_model->getDescription().replace( "\n", "<br/>" );
=====================================
modules/gui/qt/dialogs/sout/convert.cpp
=====================================
@@ -156,7 +156,7 @@ ConvertDialog::ConvertDialog( QWindow *parent, qt_intf_t
*_p_intf,
void ConvertDialog::fileBrowse()
{
- QString fileExtension = ( ! profile->isEnabled() ) ? ".*" : "." +
profile->getMux();
+ QString fileExtension = ( ! profile->isEnabled() ) ? QStringLiteral(".*")
: QStringLiteral(".") + profile->getMux();
outgoingMRL = QFileDialog::getSaveFileUrl( this, qtr( "Save file..." ),
p_intf->p_mi->getDialogFilePath(),
@@ -203,7 +203,7 @@ void ConvertDialog::close()
// Multiple, use the convention.
else
{
- QString fileExtension = ( ! profile->isEnabled() ) ? ".*" :
"." + profile->getMux();
+ QString fileExtension = ( ! profile->isEnabled() ) ?
QStringLiteral(".*") : QStringLiteral(".") + profile->getMux();
newFileName = incomingMRLs->at(i);
=====================================
modules/gui/qt/meson.build
=====================================
@@ -7,7 +7,7 @@ qt6 = import('qt6')
qt_include_dir = include_directories('.')
qt_extra_deps = []
-qt_extra_flags = ['-DQT_STRICT_ITERATORS']
+qt_extra_flags = ['-DQT_STRICT_ITERATORS','-DQT_USE_QSTRINGBUILDER']
qt_cppargs = []
qt_link_args = []
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0450706563e262c5728ff159241ec276fc359969
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0450706563e262c5728ff159241ec276fc359969
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
