platform2: sweep the lint errors identified by the updated linter
cpplint.py has been updated and identified new issues in existing
code. Stuff like overridden functions that specify 'override' should
not be marked as 'virtual', and constructors with no parameters
should not be marked as 'explicit'.
BUG=None
TEST=cpplint.py `find ./platform2 -name *.cc -or -name *.h`
Change-Id: Ibb9de43286d874d076ffd5ebb1b13c36ec794f01
Reviewed-on: https://chromium-review.googlesource.com/211950
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/active_passive_out_of_credits_detector.h b/active_passive_out_of_credits_detector.h
index bd123a7..5a99e24 100644
--- a/active_passive_out_of_credits_detector.h
+++ b/active_passive_out_of_credits_detector.h
@@ -24,13 +24,12 @@
CellularService *service);
virtual ~ActivePassiveOutOfCreditsDetector();
- virtual void ResetDetector() override;
- virtual bool IsDetecting() const override;
- virtual void NotifyServiceStateChanged(
+ void ResetDetector() override;
+ bool IsDetecting() const override;
+ void NotifyServiceStateChanged(
Service::ConnectState old_state,
Service::ConnectState new_state) override;
- virtual void NotifySubscriptionStateChanged(
- uint32_t subscription_state) override {}
+ void NotifySubscriptionStateChanged(uint32_t subscription_state) override {}
const TrafficMonitor *traffic_monitor() const {
return traffic_monitor_.get();
diff --git a/cellular.h b/cellular.h
index efd8dfb..ead1668 100644
--- a/cellular.h
+++ b/cellular.h
@@ -187,40 +187,34 @@
const std::vector<std::string> &invalidated_properties);
// Inherited from Device.
- virtual void Start(Error *error, const EnabledStateChangedCallback &callback)
- override;
- virtual void Stop(Error *error, const EnabledStateChangedCallback &callback)
- override;
- virtual void LinkEvent(unsigned int flags, unsigned int change) override;
- virtual void Scan(ScanType /*scan_type*/, Error *error,
- const std::string &/*reason*/) override;
- virtual void RegisterOnNetwork(const std::string &network_id,
- Error *error,
- const ResultCallback &callback) override;
- virtual void RequirePIN(const std::string &pin, bool require,
- Error *error, const ResultCallback &callback)
- override;
- virtual void EnterPIN(const std::string &pin,
- Error *error, const ResultCallback &callback) override;
- virtual void UnblockPIN(const std::string &unblock_code,
- const std::string &pin,
- Error *error, const ResultCallback &callback)
- override;
- virtual void ChangePIN(const std::string &old_pin,
- const std::string &new_pin,
- Error *error, const ResultCallback &callback) override;
- virtual void Reset(Error *error, const ResultCallback &callback) override;
- virtual void SetCarrier(const std::string &carrier,
- Error *error, const ResultCallback &callback)
- override;
- virtual bool IsIPv6Allowed() const override;
- virtual void DropConnection() override;
- virtual void SetServiceState(Service::ConnectState state) override;
- virtual void SetServiceFailure(Service::ConnectFailure failure_state)
- override;
- virtual void SetServiceFailureSilent(Service::ConnectFailure failure_state)
- override;
- virtual void OnAfterResume() override;
+ void Start(Error *error,
+ const EnabledStateChangedCallback &callback) override;
+ void Stop(Error *error, const EnabledStateChangedCallback &callback) override;
+ void LinkEvent(unsigned int flags, unsigned int change) override;
+ void Scan(ScanType /*scan_type*/, Error *error,
+ const std::string &/*reason*/) override;
+ void RegisterOnNetwork(const std::string &network_id,
+ Error *error,
+ const ResultCallback &callback) override;
+ void RequirePIN(const std::string &pin, bool require,
+ Error *error, const ResultCallback &callback) override;
+ void EnterPIN(const std::string &pin,
+ Error *error, const ResultCallback &callback) override;
+ void UnblockPIN(const std::string &unblock_code,
+ const std::string &pin,
+ Error *error, const ResultCallback &callback) override;
+ void ChangePIN(const std::string &old_pin,
+ const std::string &new_pin,
+ Error *error, const ResultCallback &callback) override;
+ void Reset(Error *error, const ResultCallback &callback) override;
+ void SetCarrier(const std::string &carrier,
+ Error *error, const ResultCallback &callback) override;
+ bool IsIPv6Allowed() const override;
+ void DropConnection() override;
+ void SetServiceState(Service::ConnectState state) override;
+ void SetServiceFailure(Service::ConnectFailure failure_state) override;
+ void SetServiceFailureSilent(Service::ConnectFailure failure_state) override;
+ void OnAfterResume() override;
void StartModemCallback(const EnabledStateChangedCallback &callback,
const Error &error);
@@ -247,9 +241,9 @@
// Callback for |ppp_task_|.
virtual void OnPPPDied(pid_t pid, int exit);
// Implements RPCTaskDelegate, for |ppp_task_|.
- virtual void GetLogin(std::string *user, std::string *password) override;
- virtual void Notify(const std::string &reason,
- const std::map<std::string, std::string> &dict) override;
+ void GetLogin(std::string *user, std::string *password) override;
+ void Notify(const std::string &reason,
+ const std::map<std::string, std::string> &dict) override;
// ///////////////////////////////////////////////////////////////////////////
// DBus Properties exposed by the Device interface of shill.
@@ -425,7 +419,7 @@
}
// Inherited from MobileOperatorInfo::Observer
- virtual void OnOperatorChanged() override;
+ void OnOperatorChanged() override;
private:
Cellular *const cellular_;
diff --git a/cellular_capability_cdma.h b/cellular_capability_cdma.h
index 562d44a..35cdc2f 100644
--- a/cellular_capability_cdma.h
+++ b/cellular_capability_cdma.h
@@ -30,27 +30,27 @@
virtual ~CellularCapabilityCDMA();
// Inherited from CellularCapability.
- virtual std::string GetTypeString() const override;
- virtual void StartModem(Error *error,
- const ResultCallback &callback) override;
- virtual bool AreProxiesInitialized() const override;
- virtual void Activate(const std::string &carrier,
- Error *error,
- const ResultCallback &callback) override;
- virtual bool IsActivating() const override;
- virtual bool IsRegistered() const override;
- virtual void SetUnregistered(bool searching) override;
- virtual void OnServiceCreated() override;
- virtual std::string GetNetworkTechnologyString() const override;
- virtual std::string GetRoamingStateString() const override;
- virtual bool AllowRoaming() override;
- virtual void GetSignalQuality() override;
- virtual void SetupConnectProperties(DBusPropertiesMap *properties) override;
- virtual void DisconnectCleanup() override;
+ std::string GetTypeString() const override;
+ void StartModem(Error *error,
+ const ResultCallback &callback) override;
+ bool AreProxiesInitialized() const override;
+ void Activate(const std::string &carrier,
+ Error *error,
+ const ResultCallback &callback) override;
+ bool IsActivating() const override;
+ bool IsRegistered() const override;
+ void SetUnregistered(bool searching) override;
+ void OnServiceCreated() override;
+ std::string GetNetworkTechnologyString() const override;
+ std::string GetRoamingStateString() const override;
+ bool AllowRoaming() override;
+ void GetSignalQuality() override;
+ void SetupConnectProperties(DBusPropertiesMap *properties) override;
+ void DisconnectCleanup() override;
// Inherited from CellularCapabilityClassic.
- virtual void GetRegistrationState() override;
- virtual void GetProperties(const ResultCallback &callback) override;
+ void GetRegistrationState() override;
+ void GetProperties(const ResultCallback &callback) override;
virtual void GetMEID(const ResultCallback &callback);
@@ -60,9 +60,9 @@
protected:
// Inherited from CellularCapabilityClassic.
- virtual void InitProxies() override;
- virtual void ReleaseProxies() override;
- virtual void UpdateStatus(const DBusPropertiesMap &properties) override;
+ void InitProxies() override;
+ void ReleaseProxies() override;
+ void UpdateStatus(const DBusPropertiesMap &properties) override;
private:
friend class CellularCapabilityCDMATest;
@@ -103,7 +103,7 @@
// Helper method to extract the online portal information from properties.
void UpdateOnlinePortal(const DBusPropertiesMap &properties);
- virtual void UpdateServiceOLP() override;
+ void UpdateServiceOLP() override;
bool activation_starting_;
ResultCallback pending_activation_callback_;
diff --git a/cellular_capability_classic.h b/cellular_capability_classic.h
index 6abd401..ca6f139 100644
--- a/cellular_capability_classic.h
+++ b/cellular_capability_classic.h
@@ -61,20 +61,20 @@
virtual ~CellularCapabilityClassic();
// Inherited from CellularCapability.
- virtual void OnDBusPropertiesChanged(
+ void OnDBusPropertiesChanged(
const std::string &interface,
const DBusPropertiesMap &changed_properties,
const std::vector<std::string> &invalidated_properties) override;
- virtual void StopModem(Error *error, const ResultCallback &callback) override;
- virtual bool AreProxiesInitialized() const override;
- virtual void SetCarrier(const std::string &carrier,
- Error *error,
- const ResultCallback &callback) override;
- virtual void Connect(const DBusPropertiesMap &properties,
- Error *error,
- const ResultCallback &callback) override;
- virtual void Disconnect(Error *error,
- const ResultCallback &callback) override;
+ void StopModem(Error *error, const ResultCallback &callback) override;
+ bool AreProxiesInitialized() const override;
+ void SetCarrier(const std::string &carrier,
+ Error *error,
+ const ResultCallback &callback) override;
+ void Connect(const DBusPropertiesMap &properties,
+ Error *error,
+ const ResultCallback &callback) override;
+ void Disconnect(Error *error,
+ const ResultCallback &callback) override;
protected:
typedef std::vector<base::Closure> CellularTaskList;
diff --git a/cellular_capability_gsm.h b/cellular_capability_gsm.h
index 9d78a5f..15c6311 100644
--- a/cellular_capability_gsm.h
+++ b/cellular_capability_gsm.h
@@ -35,51 +35,49 @@
virtual ~CellularCapabilityGSM();
// Inherited from CellularCapability.
- virtual std::string GetTypeString() const override;
- virtual void OnDBusPropertiesChanged(
+ std::string GetTypeString() const override;
+ void OnDBusPropertiesChanged(
const std::string &interface,
const DBusPropertiesMap &changed_properties,
const std::vector<std::string> &invalidated_properties) override;
- virtual void StartModem(Error *error,
- const ResultCallback &callback) override;
- virtual bool AreProxiesInitialized() const override;
- virtual void Scan(Error *error,
- const ResultStringmapsCallback &callback) override;
- virtual void RegisterOnNetwork(const std::string &network_id,
- Error *error,
- const ResultCallback &callback) override;
- virtual bool IsRegistered() const override;
- virtual void SetUnregistered(bool searching) override;
- virtual void OnServiceCreated() override;
- virtual std::string GetNetworkTechnologyString() const override;
- virtual std::string GetRoamingStateString() const override;
- virtual bool AllowRoaming() override;
- virtual void GetSignalQuality() override;
- virtual void SetupConnectProperties(DBusPropertiesMap *properties) override;
- virtual void Connect(const DBusPropertiesMap &properties,
- Error *error,
- const ResultCallback &callback) override;
- virtual void RequirePIN(const std::string &pin,
- bool require,
- Error *error,
- const ResultCallback &callback) override;
- virtual void EnterPIN(const std::string &pin,
- Error *error,
- const ResultCallback &callback) override;
- virtual void UnblockPIN(const std::string &unblock_code,
- const std::string &pin,
- Error *error,
- const ResultCallback &callback) override;
- virtual void ChangePIN(const std::string &old_pin,
- const std::string &new_pin,
+ void StartModem(Error *error, const ResultCallback &callback) override;
+ bool AreProxiesInitialized() const override;
+ void Scan(Error *error, const ResultStringmapsCallback &callback) override;
+ void RegisterOnNetwork(const std::string &network_id,
Error *error,
const ResultCallback &callback) override;
+ bool IsRegistered() const override;
+ void SetUnregistered(bool searching) override;
+ void OnServiceCreated() override;
+ std::string GetNetworkTechnologyString() const override;
+ std::string GetRoamingStateString() const override;
+ bool AllowRoaming() override;
+ void GetSignalQuality() override;
+ void SetupConnectProperties(DBusPropertiesMap *properties) override;
+ void Connect(const DBusPropertiesMap &properties,
+ Error *error,
+ const ResultCallback &callback) override;
+ void RequirePIN(const std::string &pin,
+ bool require,
+ Error *error,
+ const ResultCallback &callback) override;
+ void EnterPIN(const std::string &pin,
+ Error *error,
+ const ResultCallback &callback) override;
+ void UnblockPIN(const std::string &unblock_code,
+ const std::string &pin,
+ Error *error,
+ const ResultCallback &callback) override;
+ void ChangePIN(const std::string &old_pin,
+ const std::string &new_pin,
+ Error *error,
+ const ResultCallback &callback) override;
// Inherited from CellularCapabilityClassic.
- virtual void GetRegistrationState() override;
+ void GetRegistrationState() override;
// The following six methods are only ever called as callbacks (from the main
// loop), which is why they don't take an Error * argument.
- virtual void GetProperties(const ResultCallback &callback) override;
+ void GetProperties(const ResultCallback &callback) override;
virtual void GetIMEI(const ResultCallback &callback);
virtual void GetIMSI(const ResultCallback &callback);
@@ -89,8 +87,8 @@
protected:
// Inherited from CellularCapabilityClassic.
- virtual void InitProxies() override;
- virtual void ReleaseProxies() override;
+ void InitProxies() override;
+ void ReleaseProxies() override;
// Initializes properties, such as IMSI, which are required before the device
// is enabled.
diff --git a/cellular_capability_universal.h b/cellular_capability_universal.h
index 22959c4..38f51f1 100644
--- a/cellular_capability_universal.h
+++ b/cellular_capability_universal.h
@@ -60,8 +60,8 @@
virtual ~CellularCapabilityUniversal();
// Inherited from CellularCapability.
- virtual std::string GetTypeString() const override;
- virtual void OnDBusPropertiesChanged(
+ std::string GetTypeString() const override;
+ void OnDBusPropertiesChanged(
const std::string &interface,
const DBusPropertiesMap &changed_properties,
const std::vector<std::string> &invalidated_properties) override;
@@ -69,47 +69,44 @@
// modem is enabled. Otherwise, the enable command is buffered until the
// modem becomes disabled. ModemManager rejects the enable command if the
// modem is not disabled, for example, if it is initializing instead.
- virtual void StartModem(Error *error,
- const ResultCallback &callback) override;
- virtual void StopModem(Error *error, const ResultCallback &callback) override;
- virtual void Reset(Error *error, const ResultCallback &callback) override;
- virtual bool AreProxiesInitialized() const override;
- virtual bool IsServiceActivationRequired() const override;
- virtual void CompleteActivation(Error *error) override;
- virtual void Scan(Error *error,
- const ResultStringmapsCallback &callback) override;
- virtual void RegisterOnNetwork(const std::string &network_id,
- Error *error,
- const ResultCallback &callback) override;
- virtual bool IsRegistered() const override;
- virtual void SetUnregistered(bool searching) override;
- virtual void OnServiceCreated() override;
- virtual std::string GetNetworkTechnologyString() const override;
- virtual std::string GetRoamingStateString() const override;
- virtual bool AllowRoaming() override;
- virtual void GetSignalQuality() override;
- virtual void SetupConnectProperties(DBusPropertiesMap *properties) override;
- virtual void Connect(const DBusPropertiesMap &properties,
- Error *error,
- const ResultCallback &callback) override;
- virtual void Disconnect(Error *error,
- const ResultCallback &callback) override;
- virtual CellularBearer *GetActiveBearer() const override;
- virtual void RequirePIN(const std::string &pin,
- bool require,
- Error *error,
- const ResultCallback &callback) override;
- virtual void EnterPIN(const std::string &pin,
- Error *error,
- const ResultCallback &callback) override;
- virtual void UnblockPIN(const std::string &unblock_code,
- const std::string &pin,
- Error *error,
- const ResultCallback &callback) override;
- virtual void ChangePIN(const std::string &old_pin,
- const std::string &new_pin,
+ void StartModem(Error *error, const ResultCallback &callback) override;
+ void StopModem(Error *error, const ResultCallback &callback) override;
+ void Reset(Error *error, const ResultCallback &callback) override;
+ bool AreProxiesInitialized() const override;
+ bool IsServiceActivationRequired() const override;
+ void CompleteActivation(Error *error) override;
+ void Scan(Error *error, const ResultStringmapsCallback &callback) override;
+ void RegisterOnNetwork(const std::string &network_id,
Error *error,
const ResultCallback &callback) override;
+ bool IsRegistered() const override;
+ void SetUnregistered(bool searching) override;
+ void OnServiceCreated() override;
+ std::string GetNetworkTechnologyString() const override;
+ std::string GetRoamingStateString() const override;
+ bool AllowRoaming() override;
+ void GetSignalQuality() override;
+ void SetupConnectProperties(DBusPropertiesMap *properties) override;
+ void Connect(const DBusPropertiesMap &properties,
+ Error *error,
+ const ResultCallback &callback) override;
+ void Disconnect(Error *error, const ResultCallback &callback) override;
+ CellularBearer *GetActiveBearer() const override;
+ void RequirePIN(const std::string &pin,
+ bool require,
+ Error *error,
+ const ResultCallback &callback) override;
+ void EnterPIN(const std::string &pin,
+ Error *error,
+ const ResultCallback &callback) override;
+ void UnblockPIN(const std::string &unblock_code,
+ const std::string &pin,
+ Error *error,
+ const ResultCallback &callback) override;
+ void ChangePIN(const std::string &old_pin,
+ const std::string &new_pin,
+ Error *error,
+ const ResultCallback &callback) override;
virtual void GetProperties();
virtual void Register(const ResultCallback &callback);
@@ -125,7 +122,7 @@
// Updates the online payment portal information, if any, for the cellular
// provider.
- virtual void UpdateServiceOLP() override;
+ void UpdateServiceOLP() override;
// Post-payment activation handlers.
virtual void UpdatePendingActivationState();
diff --git a/cellular_capability_universal_cdma.h b/cellular_capability_universal_cdma.h
index dea4e31..4a98e11 100644
--- a/cellular_capability_universal_cdma.h
+++ b/cellular_capability_universal_cdma.h
@@ -29,49 +29,49 @@
bool IsActivated() const;
// Inherited from CellularCapability.
- virtual void OnDBusPropertiesChanged(
+ void OnDBusPropertiesChanged(
const std::string &interface,
const DBusPropertiesMap &changed_properties,
const std::vector<std::string> &invalidated_properties) override;
- virtual bool IsServiceActivationRequired() const override;
- virtual bool IsActivating() const override;
- virtual void Activate(const std::string &carrier,
- Error *error,
- const ResultCallback &callback) override;
- virtual void CompleteActivation(Error *error) override;
- virtual bool IsRegistered() const override;
- virtual void SetUnregistered(bool searching) override;
- virtual void OnServiceCreated() override;
- virtual std::string GetRoamingStateString() const override;
- virtual void SetupConnectProperties(DBusPropertiesMap *properties) override;
+ bool IsServiceActivationRequired() const override;
+ bool IsActivating() const override;
+ void Activate(const std::string &carrier,
+ Error *error,
+ const ResultCallback &callback) override;
+ void CompleteActivation(Error *error) override;
+ bool IsRegistered() const override;
+ void SetUnregistered(bool searching) override;
+ void OnServiceCreated() override;
+ std::string GetRoamingStateString() const override;
+ void SetupConnectProperties(DBusPropertiesMap *properties) override;
// TODO(armansito): Remove once 3GPP is implemented in its own class
- virtual void Register(const ResultCallback &callback) override;
- virtual void RegisterOnNetwork(const std::string &network_id, Error *error,
- const ResultCallback &callback) override;
- virtual void RequirePIN(const std::string &pin, bool require, Error *error,
- const ResultCallback &callback) override;
- virtual void EnterPIN(const std::string &pin, Error *error,
- const ResultCallback &callback) override;
- virtual void UnblockPIN(const std::string &unblock_code,
- const std::string &pin, Error *error,
- const ResultCallback &callback) override;
- virtual void ChangePIN(const std::string &old_pin, const std::string &new_pin,
- Error *error, const ResultCallback &callback) override;
- virtual void Scan(Error *error,
- const ResultStringmapsCallback &callback) override;
- virtual void OnSimPathChanged(const std::string &sim_path) override;
+ void Register(const ResultCallback &callback) override;
+ void RegisterOnNetwork(const std::string &network_id, Error *error,
+ const ResultCallback &callback) override;
+ void RequirePIN(const std::string &pin, bool require, Error *error,
+ const ResultCallback &callback) override;
+ void EnterPIN(const std::string &pin, Error *error,
+ const ResultCallback &callback) override;
+ void UnblockPIN(const std::string &unblock_code,
+ const std::string &pin, Error *error,
+ const ResultCallback &callback) override;
+ void ChangePIN(const std::string &old_pin, const std::string &new_pin,
+ Error *error, const ResultCallback &callback) override;
+ void Scan(Error *error,
+ const ResultStringmapsCallback &callback) override;
+ void OnSimPathChanged(const std::string &sim_path) override;
- virtual void GetProperties() override;
+ void GetProperties() override;
protected:
// Inherited from CellularCapabilityUniversal.
- virtual void InitProxies() override;
- virtual void ReleaseProxies() override;
- virtual void UpdateServiceOLP() override;
+ void InitProxies() override;
+ void ReleaseProxies() override;
+ void UpdateServiceOLP() override;
// Post-payment activation handlers.
- virtual void UpdatePendingActivationState() override;
+ void UpdatePendingActivationState() override;
private:
friend class CellularCapabilityUniversalCDMATest;
diff --git a/device_info.cc b/device_info.cc
index 62b79ed..1fe03ef 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -36,10 +36,10 @@
#include "shill/ethernet.h"
#include "shill/logging.h"
#include "shill/manager.h"
+#include "shill/ndisc.h"
#include "shill/netlink_attribute.h"
#include "shill/netlink_manager.h"
#include "shill/nl80211_message.h"
-#include "shill/ndisc.h"
#include "shill/routing_table.h"
#include "shill/rtnl_handler.h"
#include "shill/rtnl_listener.h"
diff --git a/ephemeral_profile.h b/ephemeral_profile.h
index c02a558..179d989 100644
--- a/ephemeral_profile.h
+++ b/ephemeral_profile.h
@@ -30,15 +30,15 @@
Manager *manager);
virtual ~EphemeralProfile();
- virtual std::string GetFriendlyName() override;
- virtual bool AdoptService(const ServiceRefPtr &service) override;
- virtual bool AbandonService(const ServiceRefPtr &service) override;
+ std::string GetFriendlyName() override;
+ bool AdoptService(const ServiceRefPtr &service) override;
+ bool AbandonService(const ServiceRefPtr &service) override;
// Should not be called.
- virtual bool Save() override;
+ bool Save() override;
// Leaves |path| untouched and returns false.
- virtual bool GetStoragePath(base::FilePath */*path*/) override {
+ bool GetStoragePath(base::FilePath */*path*/) override {
return false;
}
diff --git a/ethernet_eap_provider.h b/ethernet_eap_provider.h
index 21708f1..bc5cbb4 100644
--- a/ethernet_eap_provider.h
+++ b/ethernet_eap_provider.h
@@ -33,15 +33,14 @@
virtual ~EthernetEapProvider();
// Called by Manager as a part of the Provider interface.
- virtual void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
- virtual ServiceRefPtr GetService(const KeyValueStore &args,
- Error *error) override;
- virtual ServiceRefPtr FindSimilarService(
+ void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
+ ServiceRefPtr GetService(const KeyValueStore &args, Error *error) override;
+ ServiceRefPtr FindSimilarService(
const KeyValueStore &args, Error *error) const override;
- virtual ServiceRefPtr CreateTemporaryService(
+ ServiceRefPtr CreateTemporaryService(
const KeyValueStore &args, Error *error) override;
- virtual void Start() override;
- virtual void Stop() override;
+ void Start() override;
+ void Stop() override;
virtual const ServiceRefPtr &service() const { return service_; }
diff --git a/ethernet_service.h b/ethernet_service.h
index 813b9c4..73c31bb 100644
--- a/ethernet_service.h
+++ b/ethernet_service.h
@@ -42,7 +42,7 @@
virtual void Remove(Error *error);
protected:
- virtual std::string GetTethering(Error *error) const override;
+ std::string GetTethering(Error *error) const override;
private:
FRIEND_TEST(EthernetServiceTest, GetTethering);
diff --git a/external_task.h b/external_task.h
index e9c5126..9214aff 100644
--- a/external_task.h
+++ b/external_task.h
@@ -86,8 +86,8 @@
FRIEND_TEST(ExternalTaskTest, StopNotStarted);
// Implements RPCTaskDelegate.
- virtual void GetLogin(std::string *user, std::string *password) override;
- virtual void Notify(
+ void GetLogin(std::string *user, std::string *password) override;
+ void Notify(
const std::string &event,
const std::map<std::string, std::string> &details) override;
// Called when the external process exits.
diff --git a/icmp.h b/icmp.h
index 1a654e7..39346db 100644
--- a/icmp.h
+++ b/icmp.h
@@ -16,10 +16,10 @@
// The Icmp class encapsulates the task of sending ICMP frames.
class Icmp {
public:
- explicit Icmp();
+ Icmp();
virtual ~Icmp();
- // Create a socket for tranmission of ICMP frames.
+ // Create a socket for transmission of ICMP frames.
virtual bool Start();
// Destroy the transmit socket.
diff --git a/key_file_store.h b/key_file_store.h
index 9717559..9b2c6aa 100644
--- a/key_file_store.h
+++ b/key_file_store.h
@@ -51,53 +51,51 @@
bool MarkAsCorrupted();
// Inherited from StoreInterface.
- virtual bool Flush() override;
- virtual std::set<std::string> GetGroups() const override;
- virtual std::set<std::string> GetGroupsWithKey(const std::string &key)
- const override;
- virtual std::set<std::string> GetGroupsWithProperties(
+ bool Flush() override;
+ std::set<std::string> GetGroups() const override;
+ std::set<std::string> GetGroupsWithKey(const std::string &key) const override;
+ std::set<std::string> GetGroupsWithProperties(
const KeyValueStore &properties) const override;
- virtual bool ContainsGroup(const std::string &group) const override;
- virtual bool DeleteKey(const std::string &group, const std::string &key)
- override;
- virtual bool DeleteGroup(const std::string &group) override;
- virtual bool SetHeader(const std::string &header) override;
- virtual bool GetString(const std::string &group,
- const std::string &key,
- std::string *value) const override;
- virtual bool SetString(const std::string &group,
- const std::string &key,
- const std::string &value) override;
- virtual bool GetBool(const std::string &group,
- const std::string &key,
- bool *value) const override;
- virtual bool SetBool(const std::string &group,
- const std::string &key,
- bool value) override;
- virtual bool GetInt(const std::string &group,
- const std::string &key,
- int *value) const override;
- virtual bool SetInt(const std::string &group,
- const std::string &key,
- int value) override;
- virtual bool GetUint64(const std::string &group,
- const std::string &key,
- uint64_t *value) const override;
- virtual bool SetUint64(const std::string &group,
- const std::string &key,
- uint64_t value) override;
- virtual bool GetStringList(const std::string &group,
- const std::string &key,
- std::vector<std::string> *value) const override;
- virtual bool SetStringList(const std::string &group,
- const std::string &key,
- const std::vector<std::string> &value) override;
- virtual bool GetCryptedString(const std::string &group,
- const std::string &key,
- std::string *value) override;
- virtual bool SetCryptedString(const std::string &group,
- const std::string &key,
- const std::string &value) override;
+ bool ContainsGroup(const std::string &group) const override;
+ bool DeleteKey(const std::string &group, const std::string &key) override;
+ bool DeleteGroup(const std::string &group) override;
+ bool SetHeader(const std::string &header) override;
+ bool GetString(const std::string &group,
+ const std::string &key,
+ std::string *value) const override;
+ bool SetString(const std::string &group,
+ const std::string &key,
+ const std::string &value) override;
+ bool GetBool(const std::string &group,
+ const std::string &key,
+ bool *value) const override;
+ bool SetBool(const std::string &group,
+ const std::string &key,
+ bool value) override;
+ bool GetInt(const std::string &group,
+ const std::string &key,
+ int *value) const override;
+ bool SetInt(const std::string &group,
+ const std::string &key,
+ int value) override;
+ bool GetUint64(const std::string &group,
+ const std::string &key,
+ uint64_t *value) const override;
+ bool SetUint64(const std::string &group,
+ const std::string &key,
+ uint64_t value) override;
+ bool GetStringList(const std::string &group,
+ const std::string &key,
+ std::vector<std::string> *value) const override;
+ bool SetStringList(const std::string &group,
+ const std::string &key,
+ const std::vector<std::string> &value) override;
+ bool GetCryptedString(const std::string &group,
+ const std::string &key,
+ std::string *value) override;
+ bool SetCryptedString(const std::string &group,
+ const std::string &key,
+ const std::string &value) override;
private:
FRIEND_TEST(KeyFileStoreTest, OpenClose);
diff --git a/mobile_operator_info_unittest.cc b/mobile_operator_info_unittest.cc
index 9a61db3..c09d131 100644
--- a/mobile_operator_info_unittest.cc
+++ b/mobile_operator_info_unittest.cc
@@ -84,7 +84,7 @@
: operator_info_(new MobileOperatorInfo(&dispatcher_, "Operator")),
operator_info_impl_(operator_info_->impl()) {}
- virtual void TearDown() override {
+ void TearDown() override {
for (const auto &tmp_db_path : tmp_db_paths_) {
base::DeleteFile(tmp_db_path, false);
}
diff --git a/mock_ppp_device_factory.h b/mock_ppp_device_factory.h
index 2c5f2a9..7b6f1e7 100644
--- a/mock_ppp_device_factory.h
+++ b/mock_ppp_device_factory.h
@@ -16,7 +16,7 @@
class MockPPPDeviceFactory : public PPPDeviceFactory {
public:
- virtual ~MockPPPDeviceFactory() override;
+ ~MockPPPDeviceFactory() override;
// This is a singleton. Use MockPPPDeviceFactory::GetInstance()->Foo().
static MockPPPDeviceFactory *GetInstance();
diff --git a/mock_supplicant_bss_proxy.h b/mock_supplicant_bss_proxy.h
index 67b31f5..36de1e4 100644
--- a/mock_supplicant_bss_proxy.h
+++ b/mock_supplicant_bss_proxy.h
@@ -14,7 +14,7 @@
class MockSupplicantBSSProxy : public SupplicantBSSProxyInterface {
public:
- explicit MockSupplicantBSSProxy();
+ MockSupplicantBSSProxy();
virtual ~MockSupplicantBSSProxy();
MOCK_METHOD0(Die, void()); // So we can EXPECT the dtor.
diff --git a/mock_supplicant_interface_proxy.h b/mock_supplicant_interface_proxy.h
index 2178096..6d3dcdf 100644
--- a/mock_supplicant_interface_proxy.h
+++ b/mock_supplicant_interface_proxy.h
@@ -19,7 +19,7 @@
class MockSupplicantInterfaceProxy : public SupplicantInterfaceProxyInterface {
public:
- explicit MockSupplicantInterfaceProxy();
+ MockSupplicantInterfaceProxy();
virtual ~MockSupplicantInterfaceProxy();
MOCK_METHOD1(AddNetwork, ::DBus::Path(
diff --git a/netlink_manager.cc b/netlink_manager.cc
index 114bb9c..9dbbbb7 100644
--- a/netlink_manager.cc
+++ b/netlink_manager.cc
@@ -68,8 +68,7 @@
: NetlinkManager::NetlinkResponseHandler(error_handler),
handler_(handler) {}
- virtual bool HandleMessage(
- const NetlinkMessage &netlink_message) const override {
+ bool HandleMessage(const NetlinkMessage &netlink_message) const override {
if (netlink_message.message_type() !=
ControlNetlinkMessage::GetMessageType()) {
LOG(ERROR) << "Message is type " << netlink_message.message_type()
@@ -99,8 +98,7 @@
: NetlinkManager::NetlinkResponseHandler(error_handler),
handler_(handler) {}
- virtual bool HandleMessage(
- const NetlinkMessage &netlink_message) const override {
+ bool HandleMessage(const NetlinkMessage &netlink_message) const override {
if (netlink_message.message_type() != Nl80211Message::GetMessageType()) {
LOG(ERROR) << "Message is type " << netlink_message.message_type()
<< ", not " << Nl80211Message::GetMessageType()
diff --git a/netlink_manager.h b/netlink_manager.h
index c7fe231..31cb8a0 100644
--- a/netlink_manager.h
+++ b/netlink_manager.h
@@ -236,7 +236,7 @@
protected:
friend struct base::DefaultLazyInstanceTraits<NetlinkManager>;
- explicit NetlinkManager();
+ NetlinkManager();
private:
friend class NetlinkManagerTest;
diff --git a/nl80211_attribute.h b/nl80211_attribute.h
index bfa9e8c..242a63c 100644
--- a/nl80211_attribute.h
+++ b/nl80211_attribute.h
@@ -534,7 +534,7 @@
public:
static const int kName;
static const char kNameString[];
- explicit Nl80211AttributeScanFrequencies();
+ Nl80211AttributeScanFrequencies();
private:
DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeScanFrequencies);
@@ -544,7 +544,7 @@
public:
static const int kName;
static const char kNameString[];
- explicit Nl80211AttributeScanSsids();
+ Nl80211AttributeScanSsids();
private:
DISALLOW_COPY_AND_ASSIGN(Nl80211AttributeScanSsids);
diff --git a/nl80211_message.h b/nl80211_message.h
index 1b336f2..7c907cc 100644
--- a/nl80211_message.h
+++ b/nl80211_message.h
@@ -489,7 +489,7 @@
friend struct
base::DefaultLazyInstanceTraits<Nl80211MessageDataCollector>;
- explicit Nl80211MessageDataCollector();
+ Nl80211MessageDataCollector();
private:
// In order to limit the output from this class, I keep track of types I
diff --git a/no_out_of_credits_detector.h b/no_out_of_credits_detector.h
index 2b03d4b..a6890ac 100644
--- a/no_out_of_credits_detector.h
+++ b/no_out_of_credits_detector.h
@@ -22,16 +22,15 @@
virtual ~NoOutOfCreditsDetector() {}
// Resets the detector state.
- virtual void ResetDetector() override {}
+ void ResetDetector() override {}
// Returns |true| if this object is busy detecting out-of-credits.
- virtual bool IsDetecting() const override { return false; }
+ bool IsDetecting() const override { return false; }
// Notifies this object of a service state change.
- virtual void NotifyServiceStateChanged(
+ void NotifyServiceStateChanged(
Service::ConnectState old_state,
Service::ConnectState new_state) override {}
// Notifies this object when the subscription state has changed.
- virtual void NotifySubscriptionStateChanged(
- uint32_t subscription_state) override {}
+ void NotifySubscriptionStateChanged(uint32_t subscription_state) override {}
private:
DISALLOW_COPY_AND_ASSIGN(NoOutOfCreditsDetector);
diff --git a/property_observer.h b/property_observer.h
index 94bac81..1cc5632 100644
--- a/property_observer.h
+++ b/property_observer.h
@@ -36,7 +36,7 @@
// Implements PropertyObserverInterface. Compares the saved value with
// what the Get() method of |accessor_| returns. If the value has changed
// |callback_| is invoked and |saved_value_| is updated.
- virtual void Update() override {
+ void Update() override {
Error error;
T new_value_ = accessor_->Get(&error);
if (!error.IsSuccess() || saved_value_ == new_value_) {
diff --git a/service_under_test.h b/service_under_test.h
index e71958a..bbfc092 100644
--- a/service_under_test.h
+++ b/service_under_test.h
@@ -31,9 +31,9 @@
Manager *manager);
virtual ~ServiceUnderTest();
- virtual std::string GetRpcIdentifier() const override;
- virtual std::string GetDeviceRpcId(Error *error) const override;
- virtual std::string GetStorageIdentifier() const override;
+ std::string GetRpcIdentifier() const override;
+ std::string GetDeviceRpcId(Error *error) const override;
+ std::string GetStorageIdentifier() const override;
// Getter and setter for a string array property for use in testing.
void set_strings(const std::vector<std::string> &strings) {
diff --git a/stub_storage.h b/stub_storage.h
index a7d8619..2af2bce 100644
--- a/stub_storage.h
+++ b/stub_storage.h
@@ -18,83 +18,81 @@
public:
virtual ~StubStorage() {}
- virtual bool Flush() override { return false; }
- virtual std::set<std::string> GetGroups() const override {
- return {};
- }
- virtual std::set<std::string> GetGroupsWithKey(
+ bool Flush() override { return false; }
+ std::set<std::string> GetGroups() const override { return {}; }
+ std::set<std::string> GetGroupsWithKey(
const std::string &key) const override {
return {};
}
- virtual std::set<std::string> GetGroupsWithProperties(
+ std::set<std::string> GetGroupsWithProperties(
const KeyValueStore &properties) const override {
return {};
}
- virtual bool ContainsGroup(const std::string &group) const override {
+ bool ContainsGroup(const std::string &group) const override {
return false;
}
- virtual bool DeleteKey(const std::string &group, const std::string &key)
+ bool DeleteKey(const std::string &group, const std::string &key)
override { return false; }
- virtual bool DeleteGroup(const std::string &group) override { return false; }
- virtual bool SetHeader(const std::string &header) override { return false; }
- virtual bool GetString(const std::string &group,
- const std::string &key,
- std::string *value) const override {
+ bool DeleteGroup(const std::string &group) override { return false; }
+ bool SetHeader(const std::string &header) override { return false; }
+ bool GetString(const std::string &group,
+ const std::string &key,
+ std::string *value) const override {
return false;
}
- virtual bool SetString(const std::string &group,
- const std::string &key,
- const std::string &value) override {
+ bool SetString(const std::string &group,
+ const std::string &key,
+ const std::string &value) override {
return false;
}
- virtual bool GetBool(const std::string &group,
- const std::string &key,
- bool *value) const override {
+ bool GetBool(const std::string &group,
+ const std::string &key,
+ bool *value) const override {
return false;
}
- virtual bool SetBool(const std::string &group,
- const std::string &key,
- bool value) override {
+ bool SetBool(const std::string &group,
+ const std::string &key,
+ bool value) override {
return false;
}
- virtual bool GetInt(const std::string &group,
- const std::string &key,
- int *value) const override {
+ bool GetInt(const std::string &group,
+ const std::string &key,
+ int *value) const override {
return false;
}
- virtual bool SetInt(const std::string &group,
- const std::string &key,
- int value) override {
+ bool SetInt(const std::string &group,
+ const std::string &key,
+ int value) override {
return false;
}
- virtual bool GetUint64(const std::string &group,
- const std::string &key,
- uint64_t *value) const override {
+ bool GetUint64(const std::string &group,
+ const std::string &key,
+ uint64_t *value) const override {
return false;
}
- virtual bool SetUint64(const std::string &group,
- const std::string &key,
- uint64_t value) override {
+ bool SetUint64(const std::string &group,
+ const std::string &key,
+ uint64_t value) override {
return false;
}
- virtual bool GetStringList(const std::string &group,
- const std::string &key,
- std::vector<std::string> *value) const override {
+ bool GetStringList(const std::string &group,
+ const std::string &key,
+ std::vector<std::string> *value) const override {
return false;
}
- virtual bool SetStringList(const std::string &group,
- const std::string &key,
- const std::vector<std::string> &value) override {
+ bool SetStringList(const std::string &group,
+ const std::string &key,
+ const std::vector<std::string> &value) override {
return false;
}
- virtual bool GetCryptedString(const std::string &group,
- const std::string &key,
- std::string *value) override {
+ bool GetCryptedString(const std::string &group,
+ const std::string &key,
+ std::string *value) override {
return false;
}
- virtual bool SetCryptedString(const std::string &group,
- const std::string &key,
- const std::string &value) override {
+ bool SetCryptedString(const std::string &group,
+ const std::string &key,
+ const std::string &value) override {
return false;
}
};
diff --git a/subscription_state_out_of_credits_detector.h b/subscription_state_out_of_credits_detector.h
index 2da3e19..31c7b2f 100644
--- a/subscription_state_out_of_credits_detector.h
+++ b/subscription_state_out_of_credits_detector.h
@@ -18,13 +18,12 @@
CellularService *service);
virtual ~SubscriptionStateOutOfCreditsDetector();
- virtual void ResetDetector() override {}
- virtual bool IsDetecting() const override { return false; }
- virtual void NotifyServiceStateChanged(
+ void ResetDetector() override {}
+ bool IsDetecting() const override { return false; }
+ void NotifyServiceStateChanged(
Service::ConnectState old_state,
Service::ConnectState new_state) override {}
- virtual void NotifySubscriptionStateChanged(
- uint32_t subscription_state) override;
+ void NotifySubscriptionStateChanged(uint32_t subscription_state) override;
private:
friend class SubscriptionStateOutOfCreditsDetectorTest;
diff --git a/virtual_device.h b/virtual_device.h
index 5943a3b..d6fcd89 100644
--- a/virtual_device.h
+++ b/virtual_device.h
@@ -31,15 +31,15 @@
const std::string &link_name,
int interface_index,
Technology::Identifier technology);
- virtual ~VirtualDevice() override;
+ ~VirtualDevice() override;
- virtual bool Load(StoreInterface *storage) override;
- virtual bool Save(StoreInterface *storage) override;
+ bool Load(StoreInterface *storage) override;
+ bool Save(StoreInterface *storage) override;
- virtual void Start(Error *error,
- const EnabledStateChangedCallback &callback) override;
- virtual void Stop(Error *error,
- const EnabledStateChangedCallback &callback) override;
+ void Start(Error *error,
+ const EnabledStateChangedCallback &callback) override;
+ void Stop(Error *error,
+ const EnabledStateChangedCallback &callback) override;
virtual void UpdateIPConfig(const IPConfig::Properties &properties);
diff --git a/vpn_provider.h b/vpn_provider.h
index 31da358..002bfc0 100644
--- a/vpn_provider.h
+++ b/vpn_provider.h
@@ -34,15 +34,14 @@
// Called by Manager as a part of the Provider interface. The attributes
// used for matching services for the VPN provider are the ProviderType,
// ProviderHost mode and Name parameters.
- virtual void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
- virtual ServiceRefPtr FindSimilarService(
+ void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
+ ServiceRefPtr FindSimilarService(
const KeyValueStore &args, Error *error) const override;
- virtual ServiceRefPtr GetService(const KeyValueStore &args,
- Error *error) override;
- virtual ServiceRefPtr CreateTemporaryService(
+ ServiceRefPtr GetService(const KeyValueStore &args, Error *error) override;
+ ServiceRefPtr CreateTemporaryService(
const KeyValueStore &args, Error *error) override;
- virtual void Start() override;
- virtual void Stop() override;
+ void Start() override;
+ void Stop() override;
// Offers an unclaimed interface to VPN services. Returns true if this
// device has been accepted by a service.
diff --git a/vpn_service.h b/vpn_service.h
index 3ac9171..5f9a0b1 100644
--- a/vpn_service.h
+++ b/vpn_service.h
@@ -48,8 +48,8 @@
protected:
// Inherited from Service.
- virtual bool IsAutoConnectable(const char **reason) const;
- virtual std::string GetTethering(Error *error) const override;
+ bool IsAutoConnectable(const char **reason) const override;
+ std::string GetTethering(Error *error) const override;
private:
friend class VPNServiceTest;
diff --git a/wifi.h b/wifi.h
index c54a740..bfa7eb7 100644
--- a/wifi.h
+++ b/wifi.h
@@ -138,7 +138,7 @@
// Callback for when a service is configured with an IP.
virtual void OnConnected();
// Callback for when a service fails to configure with an IP.
- virtual void OnIPConfigFailure() override;
+ void OnIPConfigFailure() override;
// Implementation of SupplicantEventDelegateInterface. These methods
// are called by SupplicantInterfaceProxy, in response to events from
@@ -179,7 +179,7 @@
// Formats |ssid| for logging purposes, to ease scrubbing.
static std::string LogSSID(const std::string &ssid);
- // Called by Linkmonitor (overriden from Device superclass).
+ // Called by Linkmonitor (overridden from Device superclass).
virtual void OnLinkMonitorFailure();
bool IsCurrentService(const WiFiServiceRefPtr service) {
@@ -214,12 +214,12 @@
bool TDLSTeardown(const std::string &peer);
// Perform TDLS |operation| on |peer|.
- virtual std::string PerformTDLSOperation(const std::string &operation,
- const std::string &peer,
- Error *error) override;
+ std::string PerformTDLSOperation(const std::string &operation,
+ const std::string &peer,
+ Error *error) override;
// Overridden from Device superclass.
- virtual bool IsTrafficMonitorEnabled() const override;
+ bool IsTrafficMonitorEnabled() const override;
private:
enum ScanMethod {
diff --git a/wifi_provider.h b/wifi_provider.h
index dd42c13..b0ecf97 100644
--- a/wifi_provider.h
+++ b/wifi_provider.h
@@ -61,15 +61,14 @@
// Called by Manager as a part of the Provider interface. The attributes
// used for matching services for the WiFi provider are the SSID, mode and
// security parameters.
- virtual void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
- virtual ServiceRefPtr FindSimilarService(
+ void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
+ ServiceRefPtr FindSimilarService(
const KeyValueStore &args, Error *error) const override;
- virtual ServiceRefPtr GetService(const KeyValueStore &args,
- Error *error) override;
- virtual ServiceRefPtr CreateTemporaryService(
+ ServiceRefPtr GetService(const KeyValueStore &args, Error *error) override;
+ ServiceRefPtr CreateTemporaryService(
const KeyValueStore &args, Error *error) override;
- virtual void Start() override;
- virtual void Stop() override;
+ void Start() override;
+ void Stop() override;
// Find a Service this Endpoint should be associated with.
virtual WiFiServiceRefPtr FindServiceForEndpoint(
diff --git a/wifi_service.h b/wifi_service.h
index 74236be..c2c4526 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -102,18 +102,18 @@
const StoreInterface &storage) const;
virtual bool IsLoadableFrom(const StoreInterface &storage) const;
- // Overrride Load and Save from parent Service class. We will call
+ // Override Load and Save from parent Service class. We will call
// the parent method.
- virtual bool Load(StoreInterface *storage);
- virtual bool Save(StoreInterface *storage);
- virtual bool Unload();
+ bool Load(StoreInterface *storage) override;
+ bool Save(StoreInterface *storage) override;
+ bool Unload() override;
// Override SetState from parent Service class. We will call the
// parent method.
- virtual void SetState(ConnectState state) override;
+ void SetState(ConnectState state) override;
virtual bool HasEndpoints() const { return !endpoints_.empty(); }
- virtual bool IsVisible() const override;
+ bool IsVisible() const override;
bool IsSecurityMatch(const std::string &security) const;
// Used by WiFi objects to indicate that the credentials for this network
@@ -169,8 +169,8 @@
bool expecting_disconnect() const { return expecting_disconnect_; }
protected:
- virtual void SetEAPKeyManagement(const std::string &key_management);
- virtual std::string GetTethering(Error *error) const override;
+ void SetEAPKeyManagement(const std::string &key_management) override;
+ std::string GetTethering(Error *error) const override;
private:
friend class WiFiServiceSecurityTest;
diff --git a/wimax_provider.h b/wimax_provider.h
index 73ae1e1..630ff89 100644
--- a/wimax_provider.h
+++ b/wimax_provider.h
@@ -39,12 +39,11 @@
// Called by Manager as a part of the Provider interface. The attributes
// used for matching services for the WiMax provider are the NetworkId,
// mode and Name parameters.
- virtual void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
- virtual ServiceRefPtr FindSimilarService(
+ void CreateServicesFromProfile(const ProfileRefPtr &profile) override;
+ ServiceRefPtr FindSimilarService(
const KeyValueStore &args, Error *error) const override;
- virtual ServiceRefPtr GetService(const KeyValueStore &args,
- Error *error) override;
- virtual ServiceRefPtr CreateTemporaryService(
+ ServiceRefPtr GetService(const KeyValueStore &args, Error *error) override;
+ ServiceRefPtr CreateTemporaryService(
const KeyValueStore &args, Error *error) override;
void Start() override;
void Stop() override;