Merge pull request #6442 from The-OpenROAD-Project-staging/ct1

various: more clang-tidy

src/grt/src/fastroute/include/FastRoute.h

@@ -554,9 +554,9 @@ class FastRouteCore
    */
   void verify3DEdgesUsage();
   void layerAssignment();
-  void copyBR(void);
-  void copyRS(void);
-  void freeRR(void);
+  void copyBR();
+  void copyRS();
+  void freeRR();
   int edgeShift(Tree& t, int net);
   int edgeShiftNew(Tree& t, int net);
 

src/grt/src/fastroute/src/utility.cpp

@@ -1816,7 +1816,7 @@ bool FastRouteCore::checkRoute2DTree(int netID)
 }
 
 // Copy Routing Solution for the best routing solution so far
-void FastRouteCore::copyRS(void)
+void FastRouteCore::copyRS()
 {
   int i, j, edgeID, numEdges, numNodes;
 
@@ -1880,7 +1880,7 @@ void FastRouteCore::copyRS(void)
   }
 }
 
-void FastRouteCore::copyBR(void)
+void FastRouteCore::copyBR()
 {
   int i, j, edgeID, numEdges, numNodes, min_y, min_x, edgeCost;
 
@@ -2002,7 +2002,7 @@ void FastRouteCore::copyBR(void)
   }
 }
 
-void FastRouteCore::freeRR(void)
+void FastRouteCore::freeRR()
 {
   int edgeID, numEdges;
   if (!sttrees_bk_.empty()) {

src/gui/include/gui/gui.h

@@ -297,7 +297,7 @@ class Descriptor
 
   // An action is a name and a callback function, the function should return
   // the next object to select (when deleting the object just return Selected())
-  using ActionCallback = std::function<Selected(void)>;
+  using ActionCallback = std::function<Selected()>;
   struct Action
   {
     std::string name;
@@ -471,7 +471,7 @@ class Renderer
   // Used to register display controls for this renderer.
   // DisplayControls is a map with the name of the control and the initial
   // setting for the control
-  using DisplayControlCallback = std::function<void(void)>;
+  using DisplayControlCallback = std::function<void()>;
   struct DisplayControl
   {
     bool visibility;

src/gui/include/gui/heatMap.h

@@ -64,15 +64,15 @@ class HeatMapDataSource
   {
     std::string name;
     std::string label;
-    std::function<bool(void)> getter;
+    std::function<bool()> getter;
     std::function<void(bool)> setter;
   };
   struct MapSettingMultiChoice
   {
     std::string name;
     std::string label;
-    std::function<std::vector<std::string>(void)> choices;
-    std::function<const std::string(void)> getter;
+    std::function<std::vector<std::string>()> choices;
+    std::function<const std::string()> getter;
     std::function<void(const std::string&)> setter;
   };
 
@@ -189,13 +189,13 @@ class HeatMapDataSource
  protected:
   void addBooleanSetting(const std::string& name,
                          const std::string& label,
-                         const std::function<bool(void)>& getter,
+                         const std::function<bool()>& getter,
                          const std::function<void(bool)>& setter);
   void addMultipleChoiceSetting(
       const std::string& name,
       const std::string& label,
-      const std::function<std::vector<std::string>(void)>& choices,
-      const std::function<std::string(void)>& getter,
+      const std::function<std::vector<std::string>()>& choices,
+      const std::function<std::string()>& getter,
       const std::function<void(std::string)>& setter);
 
   void setupMap();

src/gui/src/dbDescriptors.cpp

@@ -45,7 +45,6 @@
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
 #include "odb/db.h"
-#include "odb/dbCompare.h"
 #include "odb/dbShape.h"
 #include "sta/Liberty.hh"
 #include "utl/Logger.h"
@@ -1638,9 +1637,8 @@ odb::dbObject* DbNetDescriptor::getSink(const std::any& object) const
 
 //////////////////////////////////////////////////
 
-DbITermDescriptor::DbITermDescriptor(
-    odb::dbDatabase* db,
-    std::function<bool(void)> usingPolyDecompView)
+DbITermDescriptor::DbITermDescriptor(odb::dbDatabase* db,
+                                     std::function<bool()> usingPolyDecompView)
     : BaseDbDescriptor<odb::dbITerm>(db),
       usingPolyDecompView_(std::move(usingPolyDecompView))
 {
@@ -1952,9 +1950,8 @@ bool DbBPinDescriptor::getAllObjects(SelectionSet& objects) const
 
 //////////////////////////////////////////////////
 
-DbMTermDescriptor::DbMTermDescriptor(
-    odb::dbDatabase* db,
-    std::function<bool(void)> usingPolyDecompView)
+DbMTermDescriptor::DbMTermDescriptor(odb::dbDatabase* db,
+                                     std::function<bool()> usingPolyDecompView)
     : BaseDbDescriptor<odb::dbMTerm>(db),
       usingPolyDecompView_(std::move(usingPolyDecompView))
 {

src/gui/src/dbDescriptors.h

@@ -238,7 +238,7 @@ class DbITermDescriptor : public BaseDbDescriptor<odb::dbITerm>
 {
  public:
   DbITermDescriptor(odb::dbDatabase* db,
-                    std::function<bool(void)> usingPolyDecompView);
+                    std::function<bool()> usingPolyDecompView);
 
   std::string getName(std::any object) const override;
   std::string getShortName(std::any object) const override;
@@ -255,7 +255,7 @@ class DbITermDescriptor : public BaseDbDescriptor<odb::dbITerm>
   Properties getDBProperties(odb::dbITerm* iterm) const override;
 
  private:
-  std::function<bool(void)> usingPolyDecompView_;
+  std::function<bool()> usingPolyDecompView_;
 };
 
 class DbBTermDescriptor : public BaseDbDescriptor<odb::dbBTerm>
@@ -299,7 +299,7 @@ class DbMTermDescriptor : public BaseDbDescriptor<odb::dbMTerm>
 {
  public:
   DbMTermDescriptor(odb::dbDatabase* db,
-                    std::function<bool(void)> usingPolyDecompView);
+                    std::function<bool()> usingPolyDecompView);
 
   std::string getName(std::any object) const override;
   std::string getShortName(std::any object) const override;
@@ -314,7 +314,7 @@ class DbMTermDescriptor : public BaseDbDescriptor<odb::dbMTerm>
   Properties getDBProperties(odb::dbMTerm* mterm) const override;
 
  private:
-  std::function<bool(void)> usingPolyDecompView_;
+  std::function<bool()> usingPolyDecompView_;
 };
 
 class DbViaDescriptor : public BaseDbDescriptor<odb::dbVia>

src/gui/src/displayControls.cpp

@@ -53,7 +53,7 @@
 
 Q_DECLARE_METATYPE(odb::dbTechLayer*);
 Q_DECLARE_METATYPE(odb::dbSite*);
-Q_DECLARE_METATYPE(std::function<void(void)>);
+Q_DECLARE_METATYPE(std::function<void()>);
 
 namespace gui {
 
@@ -1011,7 +1011,7 @@ void DisplayControls::displayItemDblClicked(const QModelIndex& index)
 
     auto data = name_item->data(doubleclick_item_idx_);
     if (data.isValid()) {
-      auto callback = data.value<std::function<void(void)>>();
+      auto callback = data.value<std::function<void()>>();
       callback();
       emit changed();
     }
@@ -1348,7 +1348,7 @@ void DisplayControls::makeLeafItem(ModelRow& row,
 
 void DisplayControls::setNameItemDoubleClickAction(
     ModelRow& row,
-    const std::function<void(void)>& callback)
+    const std::function<void()>& callback)
 {
   row.name->setData(QVariant::fromValue(callback), doubleclick_item_idx_);
 

src/gui/src/displayControls.h

@@ -477,7 +477,7 @@ class DisplayControls : public QDockWidget,
   void saveRendererState(Renderer* renderer);
 
   void setNameItemDoubleClickAction(ModelRow& row,
-                                    const std::function<void(void)>& callback);
+                                    const std::function<void()>& callback);
   void setItemExclusivity(ModelRow& row,
                           const std::set<std::string>& exclusivity);
 

src/gui/src/heatMap.cpp

@@ -266,7 +266,7 @@ std::string HeatMapDataSource::formatValue(double value, bool legend) const
 void HeatMapDataSource::addBooleanSetting(
     const std::string& name,
     const std::string& label,
-    const std::function<bool(void)>& getter,
+    const std::function<bool()>& getter,
     const std::function<void(bool)>& setter)
 {
   settings_.emplace_back(MapSettingBoolean{name, label, getter, setter});
@@ -275,8 +275,8 @@ void HeatMapDataSource::addBooleanSetting(
 void HeatMapDataSource::addMultipleChoiceSetting(
     const std::string& name,
     const std::string& label,
-    const std::function<std::vector<std::string>(void)>& choices,
-    const std::function<std::string(void)>& getter,
+    const std::function<std::vector<std::string>()>& choices,
+    const std::function<std::string()>& getter,
     const std::function<void(std::string)>& setter)
 {
   settings_.emplace_back(

src/gui/src/layoutTabs.cpp

@@ -46,11 +46,11 @@ LayoutTabs::LayoutTabs(Options* options,
                        const HighlightSet& highlighted,
                        const std::vector<std::unique_ptr<Ruler>>& rulers,
                        Gui* gui,
-                       std::function<bool(void)> usingDBU,
-                       std::function<bool(void)> usingPolyDecompView,
-                       std::function<bool(void)> showRulerAsEuclidian,
-                       std::function<bool(void)> default_mouse_wheel_zoom,
-                       std::function<int(void)> arrow_keys_scroll_step,
+                       std::function<bool()> usingDBU,
+                       std::function<bool()> usingPolyDecompView,
+                       std::function<bool()> showRulerAsEuclidian,
+                       std::function<bool()> default_mouse_wheel_zoom,
+                       std::function<int()> arrow_keys_scroll_step,
                        QWidget* parent)
     : QTabWidget(parent),
       options_(options),

src/gui/src/layoutTabs.h

@@ -58,11 +58,11 @@ class LayoutTabs : public QTabWidget
              const HighlightSet& highlighted,
              const std::vector<std::unique_ptr<Ruler>>& rulers,
              Gui* gui,
-             std::function<bool(void)> usingDBU,
-             std::function<bool(void)> usingPolyDecompView,
-             std::function<bool(void)> showRulerAsEuclidian,
-             std::function<bool(void)> default_mouse_wheel_zoom,
-             std::function<int(void)> arrow_keys_scroll_step,
+             std::function<bool()> usingDBU,
+             std::function<bool()> usingPolyDecompView,
+             std::function<bool()> showRulerAsEuclidian,
+             std::function<bool()> default_mouse_wheel_zoom,
+             std::function<int()> arrow_keys_scroll_step,
              QWidget* parent = nullptr);
 
   LayoutViewer* getCurrent() const { return current_viewer_; }
@@ -142,11 +142,11 @@ class LayoutTabs : public QTabWidget
   const std::vector<std::unique_ptr<Ruler>>& rulers_;
   std::map<odb::dbModule*, LayoutViewer::ModuleSettings> modules_;
   Gui* gui_;
-  std::function<bool(void)> usingDBU_;
-  std::function<bool(void)> usingPolyDecompView_;
-  std::function<bool(void)> showRulerAsEuclidian_;
-  std::function<bool(void)> default_mouse_wheel_zoom_;
-  std::function<int(void)> arrow_keys_scroll_step_;
+  std::function<bool()> usingDBU_;
+  std::function<bool()> usingPolyDecompView_;
+  std::function<bool()> showRulerAsEuclidian_;
+  std::function<bool()> default_mouse_wheel_zoom_;
+  std::function<int()> arrow_keys_scroll_step_;
   utl::Logger* logger_;
   bool command_executing_ = false;
 

src/gui/src/layoutViewer.cpp

@@ -118,9 +118,9 @@ LayoutViewer::LayoutViewer(
     const std::set<odb::dbNet*>& route_guides,
     const std::set<odb::dbNet*>& net_tracks,
     Gui* gui,
-    const std::function<bool(void)>& usingDBU,
-    const std::function<bool(void)>& showRulerAsEuclidian,
-    const std::function<bool(void)>& showDBView,
+    const std::function<bool()>& usingDBU,
+    const std::function<bool()>& showRulerAsEuclidian,
+    const std::function<bool()>& showDBView,
     QWidget* parent)
     : QWidget(parent),
       block_(nullptr),
@@ -2464,8 +2464,8 @@ void LayoutViewer::resetCache()
 ////// LayoutScroll ///////
 LayoutScroll::LayoutScroll(
     LayoutViewer* viewer,
-    const std::function<bool(void)>& default_mouse_wheel_zoom,
-    const std::function<int(void)>& arrow_keys_scroll_step,
+    const std::function<bool()>& default_mouse_wheel_zoom,
+    const std::function<int()>& arrow_keys_scroll_step,
     QWidget* parent)
     : QScrollArea(parent),
       default_mouse_wheel_zoom_(std::move(default_mouse_wheel_zoom)),

src/gui/src/layoutViewer.h

@@ -148,9 +148,9 @@ class LayoutViewer : public QWidget
                const std::set<odb::dbNet*>& route_guides,
                const std::set<odb::dbNet*>& net_tracks,
                Gui* gui,
-               const std::function<bool(void)>& usingDBU,
-               const std::function<bool(void)>& showRulerAsEuclidian,
-               const std::function<bool(void)>& showDBView,
+               const std::function<bool()>& usingDBU,
+               const std::function<bool()>& showRulerAsEuclidian,
+               const std::function<bool()>& showDBView,
                QWidget* parent = nullptr);
 
   odb::dbBlock* getBlock() const { return block_; }
@@ -394,9 +394,9 @@ class LayoutViewer : public QWidget
   bool is_view_dragging_;
   Gui* gui_;
 
-  std::function<bool(void)> usingDBU_;
-  std::function<bool(void)> showRulerAsEuclidian_;
-  std::function<bool(void)> showDBView_;
+  std::function<bool()> usingDBU_;
+  std::function<bool()> showRulerAsEuclidian_;
+  std::function<bool()> showDBView_;
 
   const std::map<odb::dbModule*, ModuleSettings>& modules_;
 
@@ -468,8 +468,8 @@ class LayoutScroll : public QScrollArea
   Q_OBJECT
  public:
   LayoutScroll(LayoutViewer* viewer,
-               const std::function<bool(void)>& default_mouse_wheel_zoom,
-               const std::function<int(void)>& arrow_keys_scroll_step,
+               const std::function<bool()>& default_mouse_wheel_zoom,
+               const std::function<int()>& arrow_keys_scroll_step,
                QWidget* parent = nullptr);
   bool isScrollingWithCursor();
  signals:
@@ -488,8 +488,8 @@ class LayoutScroll : public QScrollArea
   void keyPressEvent(QKeyEvent* event) override;
 
  private:
-  std::function<bool(void)> default_mouse_wheel_zoom_;
-  std::function<int(void)> arrow_keys_scroll_step_;
+  std::function<bool()> default_mouse_wheel_zoom_;
+  std::function<int()> arrow_keys_scroll_step_;
   LayoutViewer* viewer_;
 
   bool scrolling_with_cursor_;

src/gui/src/scriptWidget.cpp

@@ -175,7 +175,7 @@ ScriptWidget::~ScriptWidget()
 void ScriptWidget::setupTcl(Tcl_Interp* interp,
                             bool interactive,
                             bool do_init_openroad,
-                            const std::function<void(void)>& post_or_init)
+                            const std::function<void()>& post_or_init)
 {
   is_interactive_ = interactive;
   input_->setTclInterp(interp, do_init_openroad, post_or_init);

src/gui/src/scriptWidget.h

@@ -70,7 +70,7 @@ class ScriptWidget : public QDockWidget
   void setupTcl(Tcl_Interp* interp,
                 bool interactive,
                 bool do_init_openroad,
-                const std::function<void(void)>& post_or_init);
+                const std::function<void()>& post_or_init);
 
   void setWidgetFont(const QFont& font);
 

src/gui/src/stub_heatMap.cpp

@@ -85,16 +85,16 @@ void HeatMapDataSource::redraw()
 void HeatMapDataSource::addBooleanSetting(
     const std::string& name,
     const std::string& label,
-    const std::function<bool(void)>& getter,
+    const std::function<bool()>& getter,
     const std::function<void(bool)>& setter)
 {
 }
 
 void HeatMapDataSource::addMultipleChoiceSetting(
     const std::string& name,
     const std::string& label,
-    const std::function<std::vector<std::string>(void)>& choices,
-    const std::function<std::string(void)>& getter,
+    const std::function<std::vector<std::string>()>& choices,
+    const std::function<std::string()>& getter,
     const std::function<void(std::string)>& setter)
 {
 }

src/gui/src/tclCmdInputWidget.cpp

@@ -90,10 +90,9 @@ TclCmdInputWidget::~TclCmdInputWidget()
   Tcl_Eval(interp_, exit_rename.c_str());
 }
 
-void TclCmdInputWidget::setTclInterp(
-    Tcl_Interp* interp,
-    bool do_init_openroad,
-    const std::function<void(void)>& post_or_init)
+void TclCmdInputWidget::setTclInterp(Tcl_Interp* interp,
+                                     bool do_init_openroad,
+                                     const std::function<void()>& post_or_init)
 {
   interp_ = interp;