From e6ea58e49ee079772e0a0796cdfb5151af316a6b Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Mon, 4 Nov 2013 21:43:54 +0100 Subject: cppcheck: fix '::operator=' should return ' &'. See http://nabble.documentfoundation.org/About-quot-assignment-operators-quot-cppcheck-warning-td4081208.html Change-Id: Ie351058a30c5d2df5f5ec1327c575e129d022cd2 --- avmedia/source/vlc/wrapper/Instance.cxx | 2 +- avmedia/source/vlc/wrapper/Instance.hxx | 2 +- avmedia/source/vlc/wrapper/Media.cxx | 2 +- avmedia/source/vlc/wrapper/Media.hxx | 2 +- avmedia/source/vlc/wrapper/Player.cxx | 2 +- avmedia/source/vlc/wrapper/Player.hxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'avmedia') diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx index a6a71d1120c1..23ddef67469b 100644 --- a/avmedia/source/vlc/wrapper/Instance.cxx +++ b/avmedia/source/vlc/wrapper/Instance.cxx @@ -49,7 +49,7 @@ namespace wrapper operator=( other ); } - const Instance& Instance::operator=( const Instance& other ) + Instance& Instance::operator=( const Instance& other ) { libvlc_release( mInstance ); mInstance = other.mInstance; diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx index 0f8c6f987989..0432bf14c9c6 100644 --- a/avmedia/source/vlc/wrapper/Instance.hxx +++ b/avmedia/source/vlc/wrapper/Instance.hxx @@ -24,7 +24,7 @@ namespace wrapper static bool LoadSymbols(); Instance( int argc, const char * const argv[] ); Instance( const Instance& other ); - const Instance& operator=( const Instance& other ); + Instance& operator=( const Instance& other ); virtual ~Instance(); inline operator libvlc_instance_t*() diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx index d48ad49619e2..0ab140f89da7 100644 --- a/avmedia/source/vlc/wrapper/Media.cxx +++ b/avmedia/source/vlc/wrapper/Media.cxx @@ -74,7 +74,7 @@ Media::Media( const Media& other ) operator=( other ); } -const Media& Media::operator=( const Media& other ) +Media& Media::operator=( const Media& other ) { libvlc_media_release( mMedia ); mMedia = other.mMedia; diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx index 26627eb90eb2..0cdadf0d33c9 100644 --- a/avmedia/source/vlc/wrapper/Media.hxx +++ b/avmedia/source/vlc/wrapper/Media.hxx @@ -27,7 +27,7 @@ namespace wrapper static bool LoadSymbols(); Media( const rtl::OUString& url, Instance& instance ); Media( const Media& other ); - const Media& operator=( const Media& other ); + Media& operator=( const Media& other ); int getDuration() const; diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index cd572675c615..2d38e3ad71a8 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -117,7 +117,7 @@ namespace wrapper operator=( other ); } - const Player& Player::operator=( const Player& other ) + Player& Player::operator=( const Player& other ) { libvlc_media_player_release( mPlayer ); mPlayer = other.mPlayer; diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx index 05101977ef03..77e45914f2b6 100644 --- a/avmedia/source/vlc/wrapper/Player.hxx +++ b/avmedia/source/vlc/wrapper/Player.hxx @@ -33,7 +33,7 @@ namespace wrapper static bool LoadSymbols(); Player( Media& media ); Player( const Player& other ); - const Player& operator=( const Player& other ); + Player& operator=( const Player& other ); virtual ~Player(); bool play(); -- cgit v1.2.3