summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /avmedia
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff)
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/vlc/wrapper/Instance.hxx2
-rw-r--r--avmedia/source/vlc/wrapper/Media.hxx2
-rw-r--r--avmedia/source/vlc/wrapper/Player.hxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx
index 76d800bd497a..241caf6d94e3 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/wrapper/Instance.hxx
@@ -27,7 +27,7 @@ namespace wrapper
Instance& operator=( const Instance& other );
virtual ~Instance();
- inline operator libvlc_instance_t*()
+ operator libvlc_instance_t*()
{
return mInstance;
}
diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx
index cf1d4e719ca7..a7535f7d783e 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/wrapper/Media.hxx
@@ -33,7 +33,7 @@ namespace wrapper
virtual ~Media();
- inline operator libvlc_media_t*()
+ operator libvlc_media_t*()
{
return mMedia;
}
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index e8058a8f4b03..a7306825f5f6 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -63,7 +63,7 @@ namespace wrapper
unsigned getWidth() const;
unsigned getHeight() const;
- inline operator libvlc_media_player_t*()
+ operator libvlc_media_player_t*()
{
return mPlayer;
}