clang-tidy recent changes

8 files changed, 22 insertions, 24 deletions

diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp
index f98d3f25b..60779f03a 100644
--- a/src/ui/toolbar/gradient-toolbar.cpp
+++ b/src/ui/toolbar/gradient-toolbar.cpp
@@ -943,7 +943,7 @@ GradientToolbar::selection_changed(Inkscape::Selection * /*selection*/)
 
         _stop_cb->set_sensitive( gr_selected && !gr_multi);
 
-        int stop = update_stop_list (gr_selected, nullptr, gr_multi);
+        update_stop_list (gr_selected, nullptr, gr_multi);
         select_stop_by_draggers(gr_selected, ev);
     }
 
diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp
index 8d6805487..e8fc61bc9 100644
--- a/src/ui/toolbar/select-toolbar.cpp
+++ b/src/ui/toolbar/select-toolbar.cpp
@@ -64,8 +64,8 @@ SelectToolbar::SelectToolbar(SPDesktop *desktop) :
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    auto select_all_button               = add_toolbutton_for_verb(SP_VERB_EDIT_SELECT_ALL);
-    auto select_all_in_all_layers_button = add_toolbutton_for_verb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS);
+    add_toolbutton_for_verb(SP_VERB_EDIT_SELECT_ALL);
+    add_toolbutton_for_verb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS);
     auto deselect_button                 = add_toolbutton_for_verb(SP_VERB_EDIT_DESELECT);
     _context_items.push_back(deselect_button);
 
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index 3533482cf..9060f6b86 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -152,6 +152,9 @@ public:
 
     virtual ~ToolBase();
 
+    ToolBase(const ToolBase&) = delete;
+    ToolBase& operator=(const ToolBase&) = delete;
+
     Inkscape::Preferences::Observer *pref_observer;
     Glib::RefPtr<Gdk::Cursor> cursor;
 
@@ -230,8 +233,6 @@ protected:
     bool sp_event_context_knot_mouseover() const;
 
 private:
-	ToolBase(const ToolBase&) = delete;
-	ToolBase& operator=(const ToolBase&) = delete;
         bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir);
 
         
diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h
index f7d39f59d..5cb799ce9 100644
--- a/src/ui/uxmanager.h
+++ b/src/ui/uxmanager.h
@@ -38,12 +38,11 @@ public:
 
     virtual bool isWidescreen() const = 0;
 
-protected:
-    UXManager();
-
-private:
     UXManager( UXManager const & ) = delete;
     UXManager & operator=( UXManager const & ) = delete;
+
+protected:
+    UXManager();
 };
 
 } // namespace UI
diff --git a/src/ui/widget/combo-tool-item.cpp b/src/ui/widget/combo-tool-item.cpp
index ee9202b6f..eb26e5c6e 100644
--- a/src/ui/widget/combo-tool-item.cpp
+++ b/src/ui/widget/combo-tool-item.cpp
@@ -39,13 +39,13 @@ ComboToolItem::create(const Glib::ustring &group_label,
     return new ComboToolItem(group_label, tooltip, stock_id, store);
 }
 
-ComboToolItem::ComboToolItem(const Glib::ustring &group_label,
-                             const Glib::ustring &tooltip,
-                             const Glib::ustring &stock_id,
+ComboToolItem::ComboToolItem(Glib::ustring group_label,
+                             Glib::ustring tooltip,
+                             Glib::ustring stock_id,
                              Glib::RefPtr<Gtk::ListStore> store ) :
-    _group_label( group_label ),
-    _tooltip( tooltip ),
-    _stock_id( stock_id ),
+    _group_label(std::move( group_label )),
+    _tooltip(std::move( tooltip )),
+    _stock_id(std::move( stock_id )),
     _store (std::move(store)),
     _use_label (true),
     _use_icon  (false),
diff --git a/src/ui/widget/combo-tool-item.h b/src/ui/widget/combo-tool-item.h
index 50f81cc43..1e4590163 100644
--- a/src/ui/widget/combo-tool-item.h
+++ b/src/ui/widget/combo-tool-item.h
@@ -105,9 +105,9 @@ private:
     void on_changed_combobox();
     void on_toggled_radiomenu(int n);
 
-    ComboToolItem(const Glib::ustring &group_label,
-                  const Glib::ustring &tooltip,
-                  const Glib::ustring &stock_id,
+    ComboToolItem(Glib::ustring group_label,
+                  Glib::ustring tooltip,
+                  Glib::ustring stock_id,
                   Glib::RefPtr<Gtk::ListStore> store );
 };
 }
diff --git a/src/ui/widget/spin-button-tool-item.cpp b/src/ui/widget/spin-button-tool-item.cpp
index 2efb24ff9..140df1586 100644
--- a/src/ui/widget/spin-button-tool-item.cpp
+++ b/src/ui/widget/spin-button-tool-item.cpp
@@ -274,7 +274,6 @@ SpinButtonToolItem::create_numeric_menu()
     auto adj_value = adj->get_value();
     auto lower = adj->get_lower();
     auto upper = adj->get_upper();
-    auto range = upper - lower;
     auto step = adj->get_step_increment();
     auto page = adj->get_page_increment();
 
diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h
index 33ff11576..c41aabf84 100644
--- a/src/ui/widget/spinbutton.h
+++ b/src/ui/widget/spinbutton.h
@@ -48,6 +48,10 @@ public:
 
   ~SpinButton() override = default;;
 
+  // noncopyable
+  SpinButton(const SpinButton&) = delete;
+  SpinButton& operator=(const SpinButton&) = delete;
+
   void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; };
   
   void addUnitTracker(UnitTracker* ut) { _unit_tracker = ut; };
@@ -87,11 +91,6 @@ protected:
      * Undo the editing, by resetting the value upon when the spinbutton got focus.
      */
     void undo();
-
-private:
-  // noncopyable
-  SpinButton(const SpinButton&) = delete;
-  SpinButton& operator=(const SpinButton&) = delete;
 };
 
 } // namespace Widget