Clang-tidy fixes

rcaelers · Nov 25, 2023 · 3d10dde · 3d10dde
1 parent 6a33df9
commit 3d10dde
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/ui/app/Application.cc b/ui/app/Application.cc
@@ -39,7 +39,6 @@
 #include "ui/IBreakWindow.hh"
 #include "ui/Plugin.hh"
 #include "ui/IToolkitFactory.hh"
-#include "commonui/nls.h"
 #include "commonui/Locale.hh"
 #include "commonui/Text.hh"
 #include "utils/Exception.hh"
@@ -593,7 +592,7 @@ Application::get_timers_tooltip()
 
   for (int count = 0; count < BREAK_ID_SIZEOF; count++)
     {
-      auto b = core->get_break(BreakId(count));
+      auto *b = core->get_break(BreakId(count));
       bool on = b->is_enabled();
 
       if (b != nullptr && on)
@@ -648,7 +647,7 @@ Application::on_idle_changed(bool new_idle)
   if (new_idle && !is_idle)
     {
       TRACE_MSG("Now idle");
-      auto rest_break = core->get_break(BREAK_ID_REST_BREAK);
+      auto *rest_break = core->get_break(BREAK_ID_REST_BREAK);
 
       taking = rest_break->is_taking();
       TRACE_MSG("taking {}", taking);
@@ -666,7 +665,7 @@ Application::on_idle_changed(bool new_idle)
         {
           TRACE_MSG("Automatic natural break enabled");
 
-          auto rest_break = core->get_break(BREAK_ID_REST_BREAK);
+          auto *rest_break = core->get_break(BREAK_ID_REST_BREAK);
 
           if (core->get_regular_operation_mode() == OperationMode::Normal
               && rest_break->get_elapsed_idle_time() < rest_break->get_auto_reset() && rest_break->is_enabled()

diff --git a/ui/app/toolkits/gtkmm/RestBreakWindow.cc b/ui/app/toolkits/gtkmm/RestBreakWindow.cc
@@ -64,7 +64,7 @@ Gtk::Widget *
 RestBreakWindow::create_gui()
 {
   // Add other widgets.
-  Gtk::VBox *vbox = new Gtk::VBox(false, 6);
+  auto *vbox = new Gtk::VBox(false, 6);
 
   pluggable_panel = Gtk::manage(new Gtk::HBox);
 
@@ -75,7 +75,7 @@ RestBreakWindow::create_gui()
   vbox->pack_start(*timebar, false, false, 6);
 
   Gtk::Box *bottom_box = create_bottom_box(true, GUIConfig::break_enable_shutdown(BREAK_ID_REST_BREAK)());
-  if (bottom_box)
+  if (bottom_box != nullptr)
     {
       vbox->pack_end(*Gtk::manage(bottom_box), Gtk::PACK_SHRINK, 6);
     }
@@ -163,7 +163,7 @@ RestBreakWindow::create_info_panel()
   Gtk::Label *info_lab = Gtk::manage(new Gtk::Label());
   Glib::ustring txt;
 
-  if (break_flags & BREAK_FLAGS_NATURAL)
+  if ((break_flags & BREAK_FLAGS_NATURAL) != 0)
     {
       txt = HigUtil::create_alert_text(_("Natural rest break"), _("This is your natural rest break."));
     }

diff --git a/ui/applets/common/src/timerbox.c b/ui/applets/common/src/timerbox.c
@@ -212,8 +212,10 @@ workrave_timerbox_update_time_bars(WorkraveTimerbox *self, cairo_t *cr)
 
   if (priv->enabled)
     {
-      int x = 0, y = 0;
-      int bar_width, bar_height;
+      int x = 0;
+      int y = 0;
+      int bar_width = 0;
+      int bar_height = 0;
 
       if (priv->force_icon)
         {
@@ -272,7 +274,8 @@ workrave_timerbox_compute_dimensions(WorkraveTimerbox *self, int *width, int *he
 {
   WorkraveTimerboxPrivate *priv = workrave_timerbox_get_instance_private(self);
 
-  int bar_width, bar_height;
+  int bar_width = 0;
+  int bar_height = 0;
   workrave_timebar_get_dimensions(priv->slot_to_time_bar[0], &bar_width, &bar_height);
 
   int icon_width = gdk_pixbuf_get_width(priv->break_to_icon[0]);
@@ -390,8 +393,8 @@ workrave_timerbox_draw(WorkraveTimerbox *self, cairo_t *cr)
 int
 workrave_timerbox_get_width(WorkraveTimerbox *self)
 {
-  int width;
-  int height;
+  int width = 0;
+  int height = 0;
   workrave_timerbox_compute_dimensions(self, &width, &height);
   return width;
 }
@@ -406,8 +409,8 @@ workrave_timerbox_get_width(WorkraveTimerbox *self)
 int
 workrave_timerbox_get_height(WorkraveTimerbox *self)
 {
-  int width;
-  int height;
+  int width = 0;
+  int height = 0;
   workrave_timerbox_compute_dimensions(self, &width, &height);
   return height;
 }