modules/power-profiles-daemon: apply clang-tidy suggestions

Author: picnoir

include/modules/power_profiles_daemon.hpp

@@ -17,15 +17,15 @@ class PowerProfilesDaemon : public ALabel {
   PowerProfilesDaemon(const std::string&, const Json::Value&);
   ~PowerProfilesDaemon();
   auto update() -> void override;
-  void profileChanged_cb(const Gio::DBus::Proxy::MapChangedProperties&,
-                         const std::vector<Glib::ustring>&);
+  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties&,
+                        const std::vector<Glib::ustring>&);
   void populateInitState();
   virtual bool handleToggle(GdkEventButton* const& e);
 
  private:
   // Look for a profile name in the list of available profiles and
   // switch activeProfile_ to it.
-  void switchToProfile_(std::string);
+  void switchToProfile(std::string const&);
   // Used to toggle/display the profiles
   std::vector<Profile> availableProfiles_;
   // Points to the active profile in the profiles list

src/modules/power_profiles_daemon.cpp

@@ -35,7 +35,7 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   } else {
     // Connect active profile callback
     powerProfileChangeSignal_ = power_profiles_proxy_->signal_properties_changed().connect(
-        sigc::mem_fun(*this, &PowerProfilesDaemon::profileChanged_cb));
+        sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
     dp.emit();
   }
@@ -45,9 +45,9 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
 // vector to store the profiles ain't the smartest move
 // complexity-wise, but it makes toggling between the mode easy. This
 // vector is 3 elements max, we'll be fine :P
-void PowerProfilesDaemon::switchToProfile_(std::string str) {
-  auto pred = [str](Profile p) { return p.name == str; };
-  activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
+void PowerProfilesDaemon::switchToProfile(std::string const& str) {
+  auto pred = [str](Profile const& p) { return p.name == str; };
+  this->activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
   if (activeProfile_ == availableProfiles_.end()) {
     throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
   }
@@ -77,7 +77,7 @@ void PowerProfilesDaemon::populateInitState() {
 
   // Find the index of the current activated mode (to toggle)
   std::string str = profileStr.get();
-  switchToProfile_(str);
+  switchToProfile(str);
 
   update();
 }
@@ -91,15 +91,15 @@ PowerProfilesDaemon::~PowerProfilesDaemon() {
   }
 }
 
-void PowerProfilesDaemon::profileChanged_cb(
+void PowerProfilesDaemon::profileChangedCb(
     const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
     const std::vector<Glib::ustring>& invalidatedProperties) {
   if (auto activeProfileVariant = changedProperties.find("ActiveProfile");
       activeProfileVariant != changedProperties.end()) {
     std::string activeProfile =
         Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
             .get();
-    switchToProfile_(activeProfile);
+    switchToProfile(activeProfile);
     update();
   }
 }
@@ -134,9 +134,9 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
     using VarStr = Glib::Variant<Glib::ustring>;
     using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
     VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
-    auto call_args = SetPowerProfileVar::create(
+    auto callArgs = SetPowerProfileVar::create(
         std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
-    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(call_args);
+    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
     power_profiles_proxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
 
     update();