[vlc-commits] [Git][videolan/vlc][master] 10 commits: qt: preferences: pass by ref instead of copying parameters
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Oct 16 11:03:55 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
5f7aac8f by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: preferences: pass by ref instead of copying parameters
Fixes CID 1666410
Fixes CID 1666405
Fixes CID 1666394
- - - - -
449ad433 by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: dialogs: move or pass by ref instead of copying
Fixes CID 1666408
Fixes CID 1666401
Fixes CID 1666400
Fixes CID 1666396
Fixes CID 1666370
Fixes CID 1666369
Fixes CID 1666347
- - - - -
cd83fb06 by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: variables: move or pass by ref instead of copying
Fixes CID 1666407
Fixes CID 1666403
Fixes CID 1666391
Fixes CID 1666381
Fixes CID 1666357
- - - - -
a859066d by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: gtktheme: move or pass by ref instead of copying parameters
Fixes CID 1666404
Fixes CID 1666377
Fixes CID 1666376
Fixes CID 1666373
Fixes CID 1666353
Fixes CID 1666349
Fixes CID 1666335
Fixes CID 1666332
Fixes CID 1666326
- - - - -
e27e92fb by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: customwidgets: move instead of copying parameter
Fixes CID 1666402
- - - - -
4424774c by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: util: move or pass by ref instead of copying
Fixes CID 1666397
Fixes CID 1666340
- - - - -
9a9e94e2 by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: player: move instead of copying on assignment
Fixes CID 1666393
Fixes CID 1666351
- - - - -
f1b0021c by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: playlist: move or pass by ref instead of copying parameters
Fixes CID 1666389
Fixes CID 1666388
Fixes CID 1666384
- - - - -
4c597726 by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: medialibrary: move or pass by ref instead of copying parameters
Fixes CID 1666374
Fixes CID 1666368
Fixes CID 1666367
Fixes CID 1666336
Fixes CID 1666334
Fixes CID 1666329
- - - - -
3097b187 by Tristan Matthews at 2025-10-16T10:42:57+00:00
qt: plugins: move instead of copying parameter
Fixes CID 1666330
- - - - -
27 changed files:
- modules/gui/qt/dialogs/dialogs_provider.cpp
- modules/gui/qt/dialogs/epg/EPGItem.cpp
- modules/gui/qt/dialogs/help/help.cpp
- modules/gui/qt/dialogs/open/open_panels.cpp
- modules/gui/qt/dialogs/plugins/plugins.cpp
- modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
- modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
- modules/gui/qt/medialibrary/medialib.cpp
- modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
- modules/gui/qt/medialibrary/mlbookmarkmodel.hpp
- modules/gui/qt/medialibrary/mlcustomcover.cpp
- modules/gui/qt/medialibrary/mlmediastore.hpp
- modules/gui/qt/medialibrary/mlvideo.cpp
- modules/gui/qt/player/player_controller.cpp
- modules/gui/qt/playlist/media.hpp
- modules/gui/qt/playlist/playlist_controller.hpp
- modules/gui/qt/playlist/playlist_model.cpp
- modules/gui/qt/playlist/playlist_model_p.hpp
- modules/gui/qt/style/gtkthemeprovider/gtk_util.cpp
- modules/gui/qt/style/gtkthemeprovider/gtkthemeprovider.cpp
- modules/gui/qt/util/base_model.cpp
- modules/gui/qt/util/color_svg_image_provider.cpp
- modules/gui/qt/util/color_svg_image_provider.hpp
- modules/gui/qt/util/qt_dirs.hpp
- modules/gui/qt/util/variables.cpp
- modules/gui/qt/util/variables.hpp
- modules/gui/qt/widgets/native/customwidgets.cpp
Changes:
=====================================
modules/gui/qt/dialogs/dialogs_provider.cpp
=====================================
@@ -497,7 +497,7 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
{
p_arg->i_results = 1;
p_arg->psz_results = (char **)vlc_alloc( p_arg->i_results, sizeof( char * ) );
- p_arg->psz_results[0] = strdup( qtu( toNativeSepNoSlash( file ) ) );
+ p_arg->psz_results[0] = strdup( qtu( toNativeSepNoSlash( std::move(file) ) ) );
}
else
p_arg->i_results = 0;
=====================================
modules/gui/qt/dialogs/epg/EPGItem.cpp
=====================================
@@ -166,8 +166,8 @@ bool EPGItem::setData( const vlc_epg_event_t *data )
m_start = newtime;
m_name = newname;
setToolTip( newname );
- m_description = newdesc;
- m_shortDescription = newshortdesc;
+ m_description = std::move(newdesc);
+ m_shortDescription = std::move(newshortdesc);
setDuration( data->i_duration );
setRating( data->i_rating );
m_descitems.clear();
=====================================
modules/gui/qt/dialogs/help/help.cpp
=====================================
@@ -363,7 +363,7 @@ void UpdateDialog::checkOrDownload()
QString dest_dir = QDir::tempPath();
if( !dest_dir.isEmpty() )
{
- dest_dir = toNativeSepNoSlash( dest_dir ) + DIR_SEP;
+ dest_dir = toNativeSepNoSlash( std::move(dest_dir) ) + DIR_SEP;
msg_Dbg( p_intf, "Downloading to folder: %s", qtu( dest_dir ) );
toggleVisible();
m_model->download(dest_dir);
=====================================
modules/gui/qt/dialogs/open/open_panels.cpp
=====================================
@@ -662,8 +662,9 @@ void DiscOpenPanel::browseDevice()
QFileDialog::ShowDirsOnly, schemes ).toLocalFile();
if( !dir.isEmpty() )
{
- ui.deviceCombo->addItem( toNativeSepNoSlash( dir ) );
- ui.deviceCombo->setCurrentIndex( ui.deviceCombo->findText( toNativeSepNoSlash( dir ) ) );
+ const QString dirNoSlash = toNativeSepNoSlash( std::move(dir) );
+ ui.deviceCombo->addItem( dirNoSlash );
+ ui.deviceCombo->setCurrentIndex( ui.deviceCombo->findText( dirNoSlash ) );
}
updateMRL();
@@ -1445,7 +1446,7 @@ void CaptureOpenPanel::advancedDialog()
break;
}
}
- advMRL = tempMRL;
+ advMRL = std::move(tempMRL);
updateMRL();
}
qDeleteAll( controls );
=====================================
modules/gui/qt/dialogs/plugins/plugins.cpp
=====================================
@@ -470,7 +470,7 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
frames << ":/misc/wait2.svg";
frames << ":/misc/wait3.svg";
frames << ":/misc/wait4.svg";
- spinnerAnimation = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
+ spinnerAnimation = new PixmapAnimator( this, std::move(frames), SPINNER_SIZE, SPINNER_SIZE );
connect( spinnerAnimation, &PixmapAnimator::pixmapReady,
addonsView->viewport(), QOverload<>::of(&QWidget::update) );
addonsView->viewport()->installEventFilter( this );
=====================================
modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
=====================================
@@ -410,7 +410,7 @@ void DirectoryConfigControl::updateField()
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
if( dir.isNull() ) return;
- text->setText( toNativeSepNoSlash( dir ) );
+ text->setText( toNativeSepNoSlash( std::move(dir) ) );
}
/********* String / Font **********/
@@ -1665,7 +1665,7 @@ void KeySelectorControl::reset_all( enum KeySelectorControl::ColumnIndex column
}
}
-void KeySelectorControl::reassign_key( KeyTableItem *item, QString key,
+void KeySelectorControl::reassign_key( KeyTableItem *item, const QString &key,
enum KeySelectorControl::ColumnIndex column )
{
for (QTreeWidgetItemIterator iter(table); *iter; ++iter)
@@ -1739,12 +1739,12 @@ void KeyTableItem::set_keys( QString keys, enum KeySelectorControl::ColumnIndex
setFont( KeySelectorControl::ACTION_COL, font );
}
-bool KeyTableItem::contains_key( QString key, enum KeySelectorControl::ColumnIndex column )
+bool KeyTableItem::contains_key( const QString &key, enum KeySelectorControl::ColumnIndex column )
{
return get_keys( column ).split( "\t" ).contains( key );
}
-void KeyTableItem::remove_key( QString key, enum KeySelectorControl::ColumnIndex column )
+void KeyTableItem::remove_key( const QString &key, enum KeySelectorControl::ColumnIndex column )
{
QStringList keys_list = get_keys( column ).split( "\t" );
if( keys_list.removeAll( key ) )
=====================================
modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
=====================================
@@ -444,7 +444,7 @@ protected:
void reset( KeyTableItem *, enum ColumnIndex );
void reset_all( enum KeySelectorControl::ColumnIndex column );
/** Reassign key to specified item */
- void reassign_key( KeyTableItem *item, QString keys,
+ void reassign_key( KeyTableItem *item, const QString &keys,
enum KeySelectorControl::ColumnIndex column );
void copy_value( KeyTableItem *, enum KeySelectorControl::ColumnIndex );
@@ -484,8 +484,8 @@ public:
{
set_keys( (keys) ? qfut( keys ) : qfu( "" ), column );
}
- bool contains_key( QString, enum KeySelectorControl::ColumnIndex );
- void remove_key( QString, enum KeySelectorControl::ColumnIndex );
+ bool contains_key( const QString&, enum KeySelectorControl::ColumnIndex );
+ void remove_key( const QString&, enum KeySelectorControl::ColumnIndex );
struct KeyItemAttr normal;
struct KeyItemAttr global;
};
=====================================
modules/gui/qt/medialibrary/medialib.cpp
=====================================
@@ -75,7 +75,7 @@ static void convertQUrlToPlaylistMedias(QUrl mrl, const QStringList& options, QV
medias.push_back(media);
}
-static void convertQStringToPlaylistMedias(QString mrl, const QStringList& options, QVector<vlc::playlist::Media>& medias)
+static void convertQStringToPlaylistMedias(const QString &mrl, const QStringList& options, QVector<vlc::playlist::Media>& medias)
{
vlc::playlist::Media media{ mrl, mrl, options };
medias.push_back(media);
=====================================
modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
=====================================
@@ -381,7 +381,7 @@ void MLBookmarkModel::onPlaybackStateChanged( vlc_player_t *, vlc_player_state s
}
-void MLBookmarkModel::updateMediaId(uint64_t revision, const QString mediaUri)
+void MLBookmarkModel::updateMediaId(uint64_t revision, const QString &mediaUri)
{
if (mediaUri.isEmpty())
{
=====================================
modules/gui/qt/medialibrary/mlbookmarkmodel.hpp
=====================================
@@ -90,7 +90,7 @@ private:
void* data );
void playerLengthChanged();
- void updateMediaId(uint64_t revision, const QString mediaUri);
+ void updateMediaId(uint64_t revision, const QString &mediaUri);
static void onVlcMlEvent( void* data, const vlc_ml_event_t* event );
int columnToRole(int column) const;
=====================================
modules/gui/qt/medialibrary/mlcustomcover.cpp
=====================================
@@ -183,7 +183,7 @@ class CustomCoverImageResponse : public QQuickImageResponse
public:
CustomCoverImageResponse(CoverData data, MediaLib *ml)
: ml {ml}
- , data{data}
+ , data{std::move(data)}
{
// uses Qt::QueuedConnection to give the receiver time to connect to finish()
QMetaObject::invokeMethod(this, &CustomCoverImageResponse::start, Qt::QueuedConnection);
@@ -309,5 +309,5 @@ QQuickImageResponse *MLCustomCover::requestImageResponse(const QString &id, cons
if (requestedSize.isValid())
data.size = requestedSize;
- return new CustomCoverImageResponse(data, m_ml);
+ return new CustomCoverImageResponse(std::move(data), m_ml);
}
=====================================
modules/gui/qt/medialibrary/mlmediastore.hpp
=====================================
@@ -49,7 +49,7 @@ public:
bool contains(const QString &mrl) const;
signals:
- void updated(const QString &mrl, MLMedia media);
+ void updated(const QString &mrl, const MLMedia &media);
private:
static void onVlcMlEvent(void* data
=====================================
modules/gui/qt/medialibrary/mlvideo.cpp
=====================================
@@ -138,7 +138,7 @@ void MLVideo::setIsNew(bool isNew)
void MLVideo::setSmallCover(vlc_ml_thumbnail_status_t status, QString mrl)
{
- m_smallThumbnail = {mrl, status};
+ m_smallThumbnail = {std::move(mrl), status};
}
QString MLVideo::getDisplayMRL() const
=====================================
modules/gui/qt/player/player_controller.cpp
=====================================
@@ -124,7 +124,7 @@ void PlayerControllerPrivate::UpdateName(input_item_t* media)
if( m_name != name )
{
emit q->nameChanged( name );
- m_name = name;
+ m_name = std::move(name);
}
}
@@ -142,7 +142,7 @@ void PlayerControllerPrivate::UpdateArt(input_item_t *p_item)
return;
/* Update Art meta */
- m_artUrl = url;
+ m_artUrl = std::move(url);
emit q->artChanged( m_artUrl );
}
=====================================
modules/gui/qt/playlist/media.hpp
=====================================
@@ -43,7 +43,7 @@ public:
}
}
- Media(QString uri, QString name, const QStringList &options = {})
+ Media(const QString &uri, const QString &name, const QStringList &options = {})
{
auto uUri = uri.toUtf8();
auto uName = name.toUtf8();
=====================================
modules/gui/qt/playlist/playlist_controller.hpp
=====================================
@@ -193,10 +193,10 @@ signals:
void currentIndexChanged(ssize_t index);
void itemsReset(QVector<PlaylistItem>);
- void itemsAdded(size_t index, QVector<PlaylistItem>);
+ void itemsAdded(size_t index, const QVector<PlaylistItem>&);
void itemsMoved(size_t index, size_t count, size_t target);
void itemsRemoved(size_t index, size_t count);
- void itemsUpdated(size_t index, QVector<PlaylistItem>);
+ void itemsUpdated(size_t index, const QVector<PlaylistItem>&);
void initializedChanged();
=====================================
modules/gui/qt/playlist/playlist_model.cpp
=====================================
@@ -65,7 +65,7 @@ on_playlist_items_reset(vlc_playlist_t *playlist,
that->callAsync([=]() {
if (that->m_playlist != playlist)
return;
- that->onItemsReset(newContent);
+ that->onItemsReset(std::move(newContent));
});
}
@@ -79,7 +79,7 @@ on_playlist_items_added(vlc_playlist_t *playlist, size_t index,
that->callAsync([=]() {
if (that->m_playlist != playlist)
return;
- that->onItemsAdded(added, index);
+ that->onItemsAdded(std::move(added), index);
});
}
@@ -171,7 +171,7 @@ PlaylistListModelPrivate::~PlaylistListModelPrivate()
}
}
-void PlaylistListModelPrivate::onItemsReset(const QVector<PlaylistItem>& newContent)
+void PlaylistListModelPrivate::onItemsReset(const QVector<PlaylistItem>&& newContent)
{
Q_Q(PlaylistListModel);
q->beginResetModel();
@@ -190,7 +190,7 @@ void PlaylistListModelPrivate::onItemsReset(const QVector<PlaylistItem>& newCont
emit q->countChanged(m_items.size());
}
-void PlaylistListModelPrivate::onItemsAdded(const QVector<PlaylistItem>& added, size_t index)
+void PlaylistListModelPrivate::onItemsAdded(const QVector<PlaylistItem>&& added, size_t index)
{
Q_Q(PlaylistListModel);
int count = added.size();
=====================================
modules/gui/qt/playlist/playlist_model_p.hpp
=====================================
@@ -51,8 +51,8 @@ public:
#endif
}
- void onItemsReset(const QVector<PlaylistItem>& items);
- void onItemsAdded(const QVector<PlaylistItem>& added, size_t index);
+ void onItemsReset(const QVector<PlaylistItem>&& items);
+ void onItemsAdded(const QVector<PlaylistItem>&& added, size_t index);
void onItemsMoved(size_t index, size_t count, size_t target);
void onItemsRemoved(size_t index, size_t count);
=====================================
modules/gui/qt/style/gtkthemeprovider/gtk_util.cpp
=====================================
@@ -116,7 +116,7 @@ GtkCssContext AppendCssNodeToStyleContextImpl(
gtk_style_context_set_parent(child_context, context);
gtk_widget_path_unref(path);
- return GtkCssContext(child_context);
+ return GtkCssContext(std::move(child_context));
}
}
@@ -342,7 +342,7 @@ GtkCssContext AppendCssNodeToStyleContext(GtkCssContext context,
break;
}
case CSS_CLASS:
- classes.push_back(token);
+ classes.push_back(std::move(token));
break;
case CSS_PSEUDOCLASS: {
GtkStateFlags state_flag = GTK_STATE_FLAG_NORMAL;
@@ -392,7 +392,7 @@ GtkCssContext AppendCssNodeToStyleContext(GtkCssContext context,
float scale = std::round(GetDeviceScaleFactor());
- return AppendCssNodeToStyleContextImpl(context, gtype, name, object_name,
+ return AppendCssNodeToStyleContextImpl(std::move(context), gtype, name, object_name,
classes, state, scale);
}
@@ -432,7 +432,7 @@ GdkRGBA GetBgColorFromStyleContext(GtkCssContext context) {
"}");
MySize size(24, 24);
CairoSurface surface(size);
- RenderBackground(size, surface.cairo(), context);
+ RenderBackground(size, surface.cairo(), std::move(context));
return surface.GetAveragePixelValue(false);
}
@@ -467,7 +467,7 @@ void ApplyCssProviderToContext(GtkCssContext context,
void ApplyCssToContext(GtkCssContext context, const std::string& css) {
auto provider = GetCssProvider(css);
- ApplyCssProviderToContext(context, provider);
+ ApplyCssProviderToContext(std::move(context), provider);
}
void RenderBackground(const MySize& size,
@@ -504,7 +504,7 @@ GdkRGBA GetFocusColor(const std::string& css_selector)
GdkRGBA GetSelectionBgColor(const std::string& css_selector) {
auto context = GetStyleContextFromCss(css_selector);
- return GetBgColorFromStyleContext(context);
+ return GetBgColorFromStyleContext(std::move(context));
}
=====================================
modules/gui/qt/style/gtkthemeprovider/gtkthemeprovider.cpp
=====================================
@@ -66,7 +66,7 @@ static void setGtkColor(vlc_qt_theme_provider_t* obj,
static void setGtkColorSet(vlc_qt_theme_provider_t* obj,
vlc_qt_theme_color_set set, vlc_qt_theme_color_section section,
vlc_qt_theme_color_name name,
- std::function<GdkRGBA (std::string)> getter, std::string selector)
+ std::function<GdkRGBA (std::string)> getter, const std::string &selector)
{
setGtkColor(obj, set, section, name, VQTC_STATE_NORMAL, getter(selector));
setGtkColor(obj, set, section, name, VQTC_STATE_DISABLED, getter(selector + ":disabled"));
@@ -77,32 +77,32 @@ static void setGtkColorSet(vlc_qt_theme_provider_t* obj,
static void setGtkColorSetBg(vlc_qt_theme_provider_t* obj,
vlc_qt_theme_color_set set, vlc_qt_theme_color_name name,
- std::string selector)
+ const std::string &selector)
{
- setGtkColorSet(obj, set, VQTC_SECTION_BG, name, GetBgColor, selector);
+ setGtkColorSet(obj, set, VQTC_SECTION_BG, name, GetBgColor, std::move(selector));
}
static void setGtkColorSetFg(vlc_qt_theme_provider_t* obj,
vlc_qt_theme_color_set set, vlc_qt_theme_color_name name,
- std::string selector)
+ const std::string &selector)
{
- setGtkColorSet(obj, set, VQTC_SECTION_FG, name, GetFgColor, selector);
+ setGtkColorSet(obj, set, VQTC_SECTION_FG, name, GetFgColor, std::move(selector));
}
static void setGtkColorSetFgFromBg(vlc_qt_theme_provider_t* obj,
vlc_qt_theme_color_set set, vlc_qt_theme_color_name name,
- std::string selector)
+ const std::string &selector)
{
- setGtkColorSet(obj, set, VQTC_SECTION_FG, name, GetBgColor, selector);
+ setGtkColorSet(obj, set, VQTC_SECTION_FG, name, GetBgColor, std::move(selector));
}
-static void setGtkColorSetBorder(vlc_qt_theme_provider_t* obj, vlc_qt_theme_color_set set, std::string selector)
+static void setGtkColorSetBorder(vlc_qt_theme_provider_t* obj, vlc_qt_theme_color_set set, const std::string &selector)
{
- setGtkColorSet(obj, set, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, GetBorderColor, selector);
+ setGtkColorSet(obj, set, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, GetBorderColor, std::move(selector));
}
-static void setGtkColorSetHighlight(vlc_qt_theme_provider_t* obj, vlc_qt_theme_color_set set, std::string selector)
+static void setGtkColorSetHighlight(vlc_qt_theme_provider_t* obj, vlc_qt_theme_color_set set, const std::string &selector)
{
auto setFgBg = [obj, set, &selector](vlc_qt_theme_color_state state, std::string stateStr)
{
=====================================
modules/gui/qt/util/base_model.cpp
=====================================
@@ -120,7 +120,7 @@ void BaseModel::setSearchPattern( const QString& pattern )
/* No changes */
return;
- d->m_searchPattern = patternToApply;
+ d->m_searchPattern = std::move(patternToApply);
emit searchPatternChanged();
}
=====================================
modules/gui/qt/util/color_svg_image_provider.cpp
=====================================
@@ -251,7 +251,7 @@ QQuickImageResponse* SVGColorImageImageProvider::requestImageResponse(const QStr
}
-SVGColorImageBuilder::SVGColorImageBuilder(QString path, QObject* parent)
+SVGColorImageBuilder::SVGColorImageBuilder(const QString &path, QObject* parent)
: QObject(parent)
{
m_query.addQueryItem(PATH_KEY, path);
@@ -308,7 +308,7 @@ SVGColorImage::SVGColorImage(QObject* parent)
: QObject(parent)
{}
-SVGColorImageBuilder* SVGColorImage::colorize(QString path)
+SVGColorImageBuilder* SVGColorImage::colorize(const QString &path)
{
SVGColorImageBuilder* builder = new SVGColorImageBuilder(path);
QQmlEngine::setObjectOwnership(builder, QQmlEngine::JavaScriptOwnership);
=====================================
modules/gui/qt/util/color_svg_image_provider.hpp
=====================================
@@ -43,7 +43,7 @@ class SVGColorImageBuilder : public QObject
{
Q_OBJECT
public:
- SVGColorImageBuilder(QString path, QObject* parent = nullptr);
+ SVGColorImageBuilder(const QString &path, QObject* parent = nullptr);
/**
* @brief uri will generate an uri usable with images and roud images
@@ -112,7 +112,7 @@ public:
* Handling transparent color properly would probably require a proper XML parser and defining colors
* as defs entries using solidColor node (which Qt supports)
*/
- Q_INVOKABLE SVGColorImageBuilder* colorize(QString path);
+ Q_INVOKABLE SVGColorImageBuilder* colorize(const QString &path);
};
#endif /* COLOR_SVG_IMAGE_PROVIDER_HPP */
=====================================
modules/gui/qt/util/qt_dirs.hpp
=====================================
@@ -28,7 +28,7 @@
#define toNativeSeparators( s ) QDir::toNativeSeparators ( s )
-static inline QString removeTrailingSlash( QString s )
+static inline QString removeTrailingSlash( QString&& s )
{
if( ( s.length() > 1 ) && ( s[s.length()-1] == QLatin1Char( '/' ) ) )
s.remove( s.length() - 1, 1 );
=====================================
modules/gui/qt/util/variables.cpp
=====================================
@@ -30,7 +30,7 @@ void QVLCBool::setValue(bool value)
setValueInternal(value);
}
-void QVLCString::setValue(QString value)
+void QVLCString::setValue(const QString &value)
{
setValueInternal(value);
}
=====================================
modules/gui/qt/util/variables.hpp
=====================================
@@ -114,7 +114,7 @@ class QVLCVariable : public QObject
public:
template<typename T>
- QVLCVariable(T* object, QString property, QObject* parent)
+ QVLCVariable(T* object, const QString &property, QObject* parent)
: QObject(parent)
, m_object(new VLCObjectHolderImpl<T>(nullptr))
, m_property(property)
@@ -193,7 +193,7 @@ protected:
if (m_object->get() != object)
return;
if (m_value != value) {
- m_value = value;
+ m_value = std::move(value);
Derived* derived = static_cast<Derived*>(this);
emit derived->valueChanged( m_value );
}
@@ -225,7 +225,7 @@ public:
Q_PROPERTY(bool value READ getValue WRITE setValue NOTIFY valueChanged FINAL)
template<typename T>
- QVLCBool(T* object, QString property, QObject* parent = nullptr)
+ QVLCBool(T* object, const QString &property, QObject* parent = nullptr)
: QVLCVariable<QVLCBool, bool>(object, property, parent)
{
resetObject<T>(object);
@@ -251,7 +251,7 @@ public:
Q_PROPERTY(QString value READ getValue WRITE setValue NOTIFY valueChanged FINAL)
template<typename T>
- QVLCString(T* object, QString property, QObject* parent = nullptr)
+ QVLCString(T* object, const QString &property, QObject* parent = nullptr)
: QVLCVariable<QVLCString, QString>(object, property, parent)
{
resetObject<T>(object);
@@ -263,7 +263,7 @@ public:
}
public slots:
- void setValue(QString value);
+ void setValue(const QString &value);
signals:
void valueChanged( QString );
@@ -277,7 +277,7 @@ public:
Q_PROPERTY(float value READ getValue WRITE setValue NOTIFY valueChanged FINAL)
template<typename T>
- QVLCFloat(T* object, QString property, QObject* parent = nullptr)
+ QVLCFloat(T* object, const QString &property, QObject* parent = nullptr)
: QVLCVariable<QVLCFloat, float>(object, property, parent)
{
resetObject<T>(object);
@@ -304,7 +304,7 @@ public:
Q_PROPERTY(int64_t value READ getValue WRITE setValue NOTIFY valueChanged FINAL)
template<typename T>
- QVLCInteger(T* object, QString property, QObject* parent = nullptr)
+ QVLCInteger(T* object, const QString &property, QObject* parent = nullptr)
: QVLCVariable<QVLCInteger, int64_t>(object, property, parent)
{
resetObject<T>(object);
=====================================
modules/gui/qt/widgets/native/customwidgets.cpp
=====================================
@@ -91,7 +91,7 @@ SpinningIcon::SpinningIcon( QWidget *parent ) : QLabel( parent )
frames << ":/misc/wait2.svg";
frames << ":/misc/wait3.svg";
frames << ":/misc/wait4.svg";
- animator = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
+ animator = new PixmapAnimator( this, std::move(frames), SPINNER_SIZE, SPINNER_SIZE );
connect( animator, &PixmapAnimator::pixmapReady, this, [=]( const QPixmap &pixmap ) {
this->setPixmap( pixmap );
this->repaint();
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d2008b8d09936d339eb2fb2ae73938c1d6362574...3097b1873ddd96968ad8a341accc66340aa369ad
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d2008b8d09936d339eb2fb2ae73938c1d6362574...3097b1873ddd96968ad8a341accc66340aa369ad
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list