diff options
author | agoode <agoode@chromium.org> | 2015-05-20 05:22:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 12:22:25 +0000 |
commit | ef99191240af78a81c19f34cf39c5097208246b7 (patch) | |
tree | 994132a96a41e1736c45fc26fc4eef70142792ab /media/midi | |
parent | bbf0c906f18988c315a7abfd46c721a24c132263 (diff) | |
download | chromium_src-ef99191240af78a81c19f34cf39c5097208246b7.zip chromium_src-ef99191240af78a81c19f34cf39c5097208246b7.tar.gz chromium_src-ef99191240af78a81c19f34cf39c5097208246b7.tar.bz2 |
Eliminate some trivial accessors and use "= default" for some required destructors
Review URL: https://codereview.chromium.org/1145533004
Cr-Commit-Position: refs/heads/master@{#330726}
Diffstat (limited to 'media/midi')
-rw-r--r-- | media/midi/midi_manager_alsa.cc | 47 | ||||
-rw-r--r-- | media/midi/midi_manager_alsa.h | 12 |
2 files changed, 13 insertions, 46 deletions
diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index 3023b25..76fc8c4 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -322,8 +322,7 @@ MidiManagerAlsa::MidiPort::MidiPort(const std::string& path, connected_(true) { } -MidiManagerAlsa::MidiPort::~MidiPort() { -} +MidiManagerAlsa::MidiPort::~MidiPort() = default; // Note: keep synchronized with the MidiPort::Match* methods. scoped_ptr<base::Value> MidiManagerAlsa::MidiPort::Value() const { @@ -440,13 +439,7 @@ bool MidiManagerAlsa::MidiPort::MatchNoCardPass2(const MidiPort& query) const { (query.midi_device() == -1); } -MidiManagerAlsa::MidiPortStateBase::~MidiPortStateBase() { -} - -ScopedVector<MidiManagerAlsa::MidiPort>* -MidiManagerAlsa::MidiPortStateBase::ports() { - return &ports_; -} +MidiManagerAlsa::MidiPortStateBase::~MidiPortStateBase() = default; MidiManagerAlsa::MidiPortStateBase::iterator MidiManagerAlsa::MidiPortStateBase::Find( @@ -528,8 +521,7 @@ MidiManagerAlsa::MidiPortStateBase::FindDisconnected( return ports_.end(); } -MidiManagerAlsa::MidiPortStateBase::MidiPortStateBase() { -} +MidiManagerAlsa::MidiPortStateBase::MidiPortStateBase() = default; void MidiManagerAlsa::TemporaryMidiPortState::Insert( scoped_ptr<MidiPort> port) { @@ -560,8 +552,7 @@ MidiManagerAlsa::AlsaSeqState::AlsaSeqState() : clients_deleter_(&clients_), card_client_count_(0) { } -MidiManagerAlsa::AlsaSeqState::~AlsaSeqState() { -} +MidiManagerAlsa::AlsaSeqState::~AlsaSeqState() = default; void MidiManagerAlsa::AlsaSeqState::ClientStart(int client_id, const std::string& client_name, @@ -690,37 +681,14 @@ MidiManagerAlsa::AlsaSeqState::Port::Port( : name_(name), direction_(direction), midi_(midi) { } -MidiManagerAlsa::AlsaSeqState::Port::~Port() { -} - -std::string MidiManagerAlsa::AlsaSeqState::Port::name() const { - return name_; -} - -MidiManagerAlsa::AlsaSeqState::PortDirection -MidiManagerAlsa::AlsaSeqState::Port::direction() const { - return direction_; -} - -bool MidiManagerAlsa::AlsaSeqState::Port::midi() const { - return midi_; -} +MidiManagerAlsa::AlsaSeqState::Port::~Port() = default; MidiManagerAlsa::AlsaSeqState::Client::Client(const std::string& name, snd_seq_client_type_t type) : name_(name), type_(type), ports_deleter_(&ports_) { } -MidiManagerAlsa::AlsaSeqState::Client::~Client() { -} - -std::string MidiManagerAlsa::AlsaSeqState::Client::name() const { - return name_; -} - -snd_seq_client_type_t MidiManagerAlsa::AlsaSeqState::Client::type() const { - return type_; -} +MidiManagerAlsa::AlsaSeqState::Client::~Client() = default; void MidiManagerAlsa::AlsaSeqState::Client::AddPort(int addr, scoped_ptr<Port> port) { @@ -788,8 +756,7 @@ MidiManagerAlsa::AlsaCard::AlsaCard(udev_device* dev, vendor, vendor_id_, vendor_from_database, alsa_name, alsa_longname); } -MidiManagerAlsa::AlsaCard::~AlsaCard() { -} +MidiManagerAlsa::AlsaCard::~AlsaCard() = default; // static std::string MidiManagerAlsa::AlsaCard::ExtractManufacturerString( diff --git a/media/midi/midi_manager_alsa.h b/media/midi/midi_manager_alsa.h index e8b2f6b..6228e57 100644 --- a/media/midi/midi_manager_alsa.h +++ b/media/midi/midi_manager_alsa.h @@ -164,7 +164,7 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { protected: MidiPortStateBase(); - ScopedVector<MidiPort>* ports(); + ScopedVector<MidiPort>* ports() { return &ports_; } private: ScopedVector<MidiPort> ports_; @@ -224,10 +224,10 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { Port(const std::string& name, PortDirection direction, bool midi); ~Port(); - std::string name() const; - PortDirection direction() const; + std::string name() const { return name_; } + PortDirection direction() const { return direction_; } // True if this port is a MIDI port, instead of another kind of ALSA port. - bool midi() const; + bool midi() const { return midi_; } private: const std::string name_; @@ -244,8 +244,8 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { Client(const std::string& name, snd_seq_client_type_t type); ~Client(); - std::string name() const; - snd_seq_client_type_t type() const; + std::string name() const { return name_; } + snd_seq_client_type_t type() const { return type_; } void AddPort(int addr, scoped_ptr<Port> port); void RemovePort(int addr); PortMap::const_iterator begin() const; |