diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /avmedia/source | |
parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) |
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia/source')
-rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.hxx | 8 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.hxx | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 7da1917a019b..c1341d8d6ad4 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -48,7 +48,7 @@ void FrameGrabber::disposePipeline() } } -FrameGrabber::FrameGrabber( const OUString &rURL ) : +FrameGrabber::FrameGrabber( std::u16string_view rURL ) : FrameGrabber_BASE() { gchar *pPipelineStr; @@ -87,7 +87,7 @@ FrameGrabber::~FrameGrabber() disposePipeline(); } -FrameGrabber* FrameGrabber::create( const OUString &rURL ) +FrameGrabber* FrameGrabber::create( std::u16string_view rURL ) { return new FrameGrabber( rURL ); } diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index 03c4af65f1a9..b99401526506 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -19,6 +19,10 @@ #pragma once +#include <sal/config.h> + +#include <string_view> + #include "gstplayer.hxx" #include <com/sun/star/media/XFrameGrabber.hpp> #include <cppuhelper/implbase.hxx> @@ -39,7 +43,7 @@ public: const FrameGrabber& operator=(const FrameGrabber&) =delete; // static create method instead of public Ctor - static FrameGrabber* create( const OUString &rURL ); + static FrameGrabber* create( std::u16string_view rURL ); virtual ~FrameGrabber() override; @@ -52,7 +56,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: - explicit FrameGrabber( const OUString &aURL ); + explicit FrameGrabber( std::u16string_view aURL ); }; } // avmedia::gst diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 932e1dd1c6e1..4efbc6497b09 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -527,7 +527,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) return GST_BUS_PASS; } -void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) +void Player::preparePlaybin( std::u16string_view rURL, GstElement *pSink ) { if (mpPlaybin != nullptr) { diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 4a239ca1d2a6..a82dac3f2b39 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -19,6 +19,10 @@ #pragma once +#include <sal/config.h> + +#include <string_view> + #include <osl/conditn.hxx> #include "gstcommon.hxx" @@ -42,7 +46,7 @@ public: explicit Player(); virtual ~Player() override; - void preparePlaybin( const OUString& rURL, GstElement *pSink ); + void preparePlaybin( std::u16string_view rURL, GstElement *pSink ); bool create( const OUString& rURL ); void processMessage( GstMessage *message ); GstBusSyncReply processSyncMessage( GstMessage *message ); |