From dffb2d2c87d71b9cafb0f30ed631f05d0cdbb81c Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Fri, 26 Feb 2021 19:31:32 +0100 Subject: [PATCH] Fix warnings reported by -Wignored-qualifiers --- src/zm_monitor.h | 2 +- src/zm_sdp.h | 8 ++++---- src/zm_storage.h | 4 ++-- src/zm_user.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 583b2ef4f..48dc5c072 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -459,7 +459,7 @@ public: VideoWriter GetOptVideoWriter() const { return videowriter; } //const std::vector* GetEncoderParams() const { return &encoderparamsvec; } const std::string &GetEncoderOptions() const { return encoderparams; } - const int OutputCodec() const { return output_codec; } + int OutputCodec() const { return output_codec; } const std::string &Encoder() const { return encoder; } const std::string &OutputContainer() const { return output_container; } diff --git a/src/zm_sdp.h b/src/zm_sdp.h index 456a9613b..e99c12920 100644 --- a/src/zm_sdp.h +++ b/src/zm_sdp.h @@ -114,7 +114,7 @@ public: { return( mTransport ); } - const int getPayloadType() const + int getPayloadType() const { return( mPayloadType ); } @@ -136,7 +136,7 @@ public: mControlUrl = controlUrl; } - const int getClock() const { + int getClock() const { return( mClock ); } void setClock( int clock ) { @@ -157,10 +157,10 @@ public: void setSprops(const std::string &props) { mSprops = props; } - const std::string getSprops() const { + std::string getSprops() const { return ( mSprops ); } - const double getFrameRate() const { + double getFrameRate() const { return( mFrameRate ); } void setFrameRate( double frameRate ) { diff --git a/src/zm_storage.h b/src/zm_storage.h index f878a137d..6ea0bae5a 100644 --- a/src/zm_storage.h +++ b/src/zm_storage.h @@ -48,8 +48,8 @@ public: unsigned int Id() const { return id; } const char *Name() const { return name; } const char *Path() const { return path; } - const Schemes Scheme() const { return scheme; } - const std::string SchemeString() const { return scheme_str; } + Schemes Scheme() const { return scheme; } + std::string SchemeString() const { return scheme_str; } }; #endif // ZM_STORAGE_H diff --git a/src/zm_user.h b/src/zm_user.h index d327500a8..a2d96a477 100644 --- a/src/zm_user.h +++ b/src/zm_user.h @@ -52,7 +52,7 @@ class User { Copy(u); return *this; } - const int Id() const { return id; } + int Id() const { return id; } const char *getUsername() const { return username; } const char *getPassword() const { return password; } bool isEnabled() const { return enabled; }