Commit ef991912 authored by agoode's avatar agoode Committed by Commit bot

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}
parent bbf0c906
...@@ -322,8 +322,7 @@ MidiManagerAlsa::MidiPort::MidiPort(const std::string& path, ...@@ -322,8 +322,7 @@ MidiManagerAlsa::MidiPort::MidiPort(const std::string& path,
connected_(true) { connected_(true) {
} }
MidiManagerAlsa::MidiPort::~MidiPort() { MidiManagerAlsa::MidiPort::~MidiPort() = default;
}
// Note: keep synchronized with the MidiPort::Match* methods. // Note: keep synchronized with the MidiPort::Match* methods.
scoped_ptr<base::Value> MidiManagerAlsa::MidiPort::Value() const { scoped_ptr<base::Value> MidiManagerAlsa::MidiPort::Value() const {
...@@ -440,13 +439,7 @@ bool MidiManagerAlsa::MidiPort::MatchNoCardPass2(const MidiPort& query) const { ...@@ -440,13 +439,7 @@ bool MidiManagerAlsa::MidiPort::MatchNoCardPass2(const MidiPort& query) const {
(query.midi_device() == -1); (query.midi_device() == -1);
} }
MidiManagerAlsa::MidiPortStateBase::~MidiPortStateBase() { MidiManagerAlsa::MidiPortStateBase::~MidiPortStateBase() = default;
}
ScopedVector<MidiManagerAlsa::MidiPort>*
MidiManagerAlsa::MidiPortStateBase::ports() {
return &ports_;
}
MidiManagerAlsa::MidiPortStateBase::iterator MidiManagerAlsa::MidiPortStateBase::iterator
MidiManagerAlsa::MidiPortStateBase::Find( MidiManagerAlsa::MidiPortStateBase::Find(
...@@ -528,8 +521,7 @@ MidiManagerAlsa::MidiPortStateBase::FindDisconnected( ...@@ -528,8 +521,7 @@ MidiManagerAlsa::MidiPortStateBase::FindDisconnected(
return ports_.end(); return ports_.end();
} }
MidiManagerAlsa::MidiPortStateBase::MidiPortStateBase() { MidiManagerAlsa::MidiPortStateBase::MidiPortStateBase() = default;
}
void MidiManagerAlsa::TemporaryMidiPortState::Insert( void MidiManagerAlsa::TemporaryMidiPortState::Insert(
scoped_ptr<MidiPort> port) { scoped_ptr<MidiPort> port) {
...@@ -560,8 +552,7 @@ MidiManagerAlsa::AlsaSeqState::AlsaSeqState() ...@@ -560,8 +552,7 @@ MidiManagerAlsa::AlsaSeqState::AlsaSeqState()
: clients_deleter_(&clients_), card_client_count_(0) { : clients_deleter_(&clients_), card_client_count_(0) {
} }
MidiManagerAlsa::AlsaSeqState::~AlsaSeqState() { MidiManagerAlsa::AlsaSeqState::~AlsaSeqState() = default;
}
void MidiManagerAlsa::AlsaSeqState::ClientStart(int client_id, void MidiManagerAlsa::AlsaSeqState::ClientStart(int client_id,
const std::string& client_name, const std::string& client_name,
...@@ -690,37 +681,14 @@ MidiManagerAlsa::AlsaSeqState::Port::Port( ...@@ -690,37 +681,14 @@ MidiManagerAlsa::AlsaSeqState::Port::Port(
: name_(name), direction_(direction), midi_(midi) { : name_(name), direction_(direction), midi_(midi) {
} }
MidiManagerAlsa::AlsaSeqState::Port::~Port() { MidiManagerAlsa::AlsaSeqState::Port::~Port() = default;
}
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::Client::Client(const std::string& name, MidiManagerAlsa::AlsaSeqState::Client::Client(const std::string& name,
snd_seq_client_type_t type) snd_seq_client_type_t type)
: name_(name), type_(type), ports_deleter_(&ports_) { : name_(name), type_(type), ports_deleter_(&ports_) {
} }
MidiManagerAlsa::AlsaSeqState::Client::~Client() { MidiManagerAlsa::AlsaSeqState::Client::~Client() = default;
}
std::string MidiManagerAlsa::AlsaSeqState::Client::name() const {
return name_;
}
snd_seq_client_type_t MidiManagerAlsa::AlsaSeqState::Client::type() const {
return type_;
}
void MidiManagerAlsa::AlsaSeqState::Client::AddPort(int addr, void MidiManagerAlsa::AlsaSeqState::Client::AddPort(int addr,
scoped_ptr<Port> port) { scoped_ptr<Port> port) {
...@@ -788,8 +756,7 @@ MidiManagerAlsa::AlsaCard::AlsaCard(udev_device* dev, ...@@ -788,8 +756,7 @@ MidiManagerAlsa::AlsaCard::AlsaCard(udev_device* dev,
vendor, vendor_id_, vendor_from_database, alsa_name, alsa_longname); vendor, vendor_id_, vendor_from_database, alsa_name, alsa_longname);
} }
MidiManagerAlsa::AlsaCard::~AlsaCard() { MidiManagerAlsa::AlsaCard::~AlsaCard() = default;
}
// static // static
std::string MidiManagerAlsa::AlsaCard::ExtractManufacturerString( std::string MidiManagerAlsa::AlsaCard::ExtractManufacturerString(
......
...@@ -164,7 +164,7 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { ...@@ -164,7 +164,7 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager {
protected: protected:
MidiPortStateBase(); MidiPortStateBase();
ScopedVector<MidiPort>* ports(); ScopedVector<MidiPort>* ports() { return &ports_; }
private: private:
ScopedVector<MidiPort> ports_; ScopedVector<MidiPort> ports_;
...@@ -224,10 +224,10 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { ...@@ -224,10 +224,10 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager {
Port(const std::string& name, PortDirection direction, bool midi); Port(const std::string& name, PortDirection direction, bool midi);
~Port(); ~Port();
std::string name() const; std::string name() const { return name_; }
PortDirection direction() const; PortDirection direction() const { return direction_; }
// True if this port is a MIDI port, instead of another kind of ALSA port. // True if this port is a MIDI port, instead of another kind of ALSA port.
bool midi() const; bool midi() const { return midi_; }
private: private:
const std::string name_; const std::string name_;
...@@ -244,8 +244,8 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager { ...@@ -244,8 +244,8 @@ class MIDI_EXPORT MidiManagerAlsa final : public MidiManager {
Client(const std::string& name, snd_seq_client_type_t type); Client(const std::string& name, snd_seq_client_type_t type);
~Client(); ~Client();
std::string name() const; std::string name() const { return name_; }
snd_seq_client_type_t type() const; snd_seq_client_type_t type() const { return type_; }
void AddPort(int addr, scoped_ptr<Port> port); void AddPort(int addr, scoped_ptr<Port> port);
void RemovePort(int addr); void RemovePort(int addr);
PortMap::const_iterator begin() const; PortMap::const_iterator begin() const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment