diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-23 17:41:33 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-25 18:59:07 +0300 |
commit | c7bbd5bbef0780df5d0a5498e14051ee63c24e44 (patch) | |
tree | 4d1803a26e86327b404dc810709b7ea1c0a9453d /platform/qt | |
parent | 3c23f6f9f7f92ef43cb3d78e5570976058cf49c5 (diff) | |
download | qtlocation-mapboxgl-c7bbd5bbef0780df5d0a5498e14051ee63c24e44.tar.gz |
[core] Fix performance-move-const-arg
Diffstat (limited to 'platform/qt')
-rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 6 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index e83be37511..7441b1aa18 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -72,8 +72,8 @@ public: QString localFontFamily() const; void setLocalFontFamily(const QString &); - std::function<std::string(const std::string &&)> resourceTransform() const; - void setResourceTransform(const std::function<std::string(const std::string &&)> &); + std::function<std::string(const std::string &)> resourceTransform() const; + void setResourceTransform(const std::function<std::string(const std::string &)> &); private: GLContextMode m_contextMode; @@ -87,7 +87,7 @@ private: QString m_accessToken; QString m_apiBaseUrl; QString m_localFontFamily; - std::function<std::string(const std::string &&)> m_resourceTransform; + std::function<std::string(const std::string &)> m_resourceTransform; }; struct Q_MAPBOXGL_EXPORT QMapboxGLCameraOptions { diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 329bf23085..0bfc6abf73 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -439,8 +439,7 @@ void QMapboxGLSettings::setLocalFontFamily(const QString &family) /*! Returns resource transformation callback used to transform requested URLs. */ -std::function<std::string(const std::string &&)> QMapboxGLSettings::resourceTransform() const -{ +std::function<std::string(const std::string &)> QMapboxGLSettings::resourceTransform() const { return m_resourceTransform; } @@ -452,8 +451,7 @@ std::function<std::string(const std::string &&)> QMapboxGLSettings::resourceTran used add or remove custom parameters, or reroute certain requests to other servers or endpoints. */ -void QMapboxGLSettings::setResourceTransform(const std::function<std::string(const std::string &&)> &transform) -{ +void QMapboxGLSettings::setResourceTransform(const std::function<std::string(const std::string &)> &transform) { m_resourceTransform = transform; } @@ -1744,8 +1742,9 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin resourceOptions); if (settings.resourceTransform()) { - m_resourceTransform = std::make_unique<mbgl::Actor<mbgl::ResourceTransform>>(*mbgl::Scheduler::GetCurrent(), - [callback = settings.resourceTransform()] (mbgl::Resource::Kind, const std::string &&url_) -> std::string { + m_resourceTransform = std::make_unique<mbgl::Actor<mbgl::ResourceTransform>>( + *mbgl::Scheduler::GetCurrent(), + [callback = settings.resourceTransform()](mbgl::Resource::Kind, const std::string &url_) -> std::string { return callback(std::move(url_)); }); auto fs = mbgl::FileSource::getSharedFileSource(resourceOptions); |