Address various warnings and deprecations

mortbopet · Sep 26, 2023 · 8cb60ad · 8cb60ad
1 parent 16207fe
commit 8cb60ad
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/graphics/vsrtl_componentgraphic.cpp b/graphics/vsrtl_componentgraphic.cpp
@@ -165,7 +165,7 @@ void ComponentGraphic::resetWires() {
       }
     }
     // Clear wires from this components input ports
-    for (const auto &p : qAsConst(m_inputPorts)) {
+    for (const auto &p : std::as_const(m_inputPorts)) {
       p->getOutputWire()->clearWirePoints();
     }
   }
@@ -526,7 +526,7 @@ QVariant ComponentGraphic::itemChange(QGraphicsItem::GraphicsItemChange change,
     // of $this. We need to manually signal the wires going to the input ports
     // of this component, to redraw
     if (m_initialized) {
-      for (const auto &inputPort : qAsConst(m_inputPorts)) {
+      for (const auto &inputPort : std::as_const(m_inputPorts)) {
         if (!inputPort->getPort()->isConstant()) {
           if (auto *simInputPort = inputPort->getPort()->getInputPort()) {
             if (auto *graphic = simInputPort->getGraphic<PortGraphic>()) {

diff --git a/graphics/vsrtl_graphics_util.h b/graphics/vsrtl_graphics_util.h
@@ -122,7 +122,7 @@ inline void getAllChildren(QGraphicsItem *p, QList<QGraphicsItem *> &acc) {
     acc.push_back(p);
   } else {
     const auto children = p->childItems();
-    for (const auto &c : qAsConst(children)) {
+    for (const auto &c : std::as_const(children)) {
       getAllChildren(c, acc);
     }
     acc.push_back(p);

diff --git a/graphics/vsrtl_gridcomponent.cpp b/graphics/vsrtl_gridcomponent.cpp
@@ -147,7 +147,7 @@ bool GridComponent::parentContainsRect(const QRect &r) const {
 std::vector<GridComponent *> GridComponent::getGridSubcomponents() const {
   std::vector<GridComponent *> c;
   const auto children = childItems();
-  for (const auto &subc : qAsConst(children)) {
+  for (const auto &subc : std::as_const(children)) {
     auto *ptr = dynamic_cast<GridComponent *>(subc);
     if (ptr)
       c.push_back(ptr);

diff --git a/graphics/vsrtl_mainwindow.cpp b/graphics/vsrtl_mainwindow.cpp
@@ -59,7 +59,7 @@ void MainWindow::createToolbar() {
     m_vsrtlWidget->reset();
     m_netlist->reloadNetlist();
   });
-  resetAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+  resetAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R));
   simulatorToolBar->addAction(resetAct);
 
   const QIcon reverseIcon = QIcon(":/vsrtl_icons/reverse.svg");
@@ -68,7 +68,7 @@ void MainWindow::createToolbar() {
     m_vsrtlWidget->reverse();
     m_netlist->reloadNetlist();
   });
-  reverseAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Z));
+  reverseAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Z));
   simulatorToolBar->addAction(reverseAct);
   reverseAct->setEnabled(false);
   connect(m_vsrtlWidget, &VSRTLWidget::canReverse, reverseAct,
@@ -80,7 +80,7 @@ void MainWindow::createToolbar() {
     m_vsrtlWidget->clock();
     m_netlist->reloadNetlist();
   });
-  clockAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
+  clockAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C));
   simulatorToolBar->addAction(clockAct);
 
   QTimer *timer = new QTimer();

diff --git a/graphics/vsrtl_multiplexergraphic.cpp b/graphics/vsrtl_multiplexergraphic.cpp
@@ -29,7 +29,7 @@ void MultiplexerGraphic::paintOverlay(QPainter *painter,
   const unsigned int index = select->uValue();
   Q_ASSERT(static_cast<long>(index) < m_inputPorts.size());
 
-  for (const auto &ip : qAsConst(m_inputPorts)) {
+  for (const auto &ip : std::as_const(m_inputPorts)) {
     const auto *p_base = ip->getPort();
     if (p_base != select) {
       if (p_base == inputPorts[index]) {

diff --git a/graphics/vsrtl_netlist.cpp b/graphics/vsrtl_netlist.cpp
@@ -100,7 +100,7 @@ namespace {
 void getIndexComponentPtr(const QItemSelection &selected,
                           std::vector<SimComponent *> &c_v) {
   const auto indexes = selected.indexes();
-  for (const auto &sel : qAsConst(indexes)) {
+  for (const auto &sel : std::as_const(indexes)) {
     auto *c =
         static_cast<NetlistTreeItem *>(sel.internalPointer())->m_component;
     if (c) {

diff --git a/graphics/vsrtl_scene.cpp b/graphics/vsrtl_scene.cpp
@@ -54,7 +54,7 @@ void VSRTLScene::handleWirePointMove(QGraphicsSceneMouseEvent *event) {
   if (m_selectedPoint != nullptr && event->buttons() == Qt::LeftButton) {
     std::set<WirePoint *> pointsUnderCursor;
     const auto itemsAtPoint = items(event->scenePos());
-    for (const auto &item : qAsConst(itemsAtPoint)) {
+    for (const auto &item : std::as_const(itemsAtPoint)) {
       if (auto *point = dynamic_cast<WirePoint *>(item)) {
         if (m_selectedPoint->canMergeWith(point)) {
           pointsUnderCursor.insert(point);
@@ -180,7 +180,7 @@ void VSRTLScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
     std::vector<QAction *> showActions;
 
     const auto sceneItems = items();
-    for (const auto &i : qAsConst(sceneItems)) {
+    for (const auto &i : std::as_const(sceneItems)) {
       if (!i->isVisible()) {
         if (auto *c = dynamic_cast<ComponentGraphic *>(i)) {
           // If a components parent is expanded but it itself is not visible,

diff --git a/graphics/vsrtl_scene.h b/graphics/vsrtl_scene.h
@@ -67,7 +67,7 @@ class VSRTLScene : public QGraphicsScene {
   template <typename T, typename F, typename... Args>
   void execOnItems(F f, Args... args) {
     const auto sceneItems = items();
-    for (auto *c : qAsConst(sceneItems)) {
+    for (auto *c : std::as_const(sceneItems)) {
       if (auto *t_c = dynamic_cast<T *>(c)) {
         (t_c->*f)(args...);
       }
@@ -80,7 +80,7 @@ class VSRTLScene : public QGraphicsScene {
   void predicatedExecOnItems(std::function<bool(const T *)> pred, F &&f,
                              Args... args) {
     const auto sceneItems = items();
-    for (auto *c : qAsConst(sceneItems)) {
+    for (auto *c : std::as_const(sceneItems)) {
       if (auto *t_c = dynamic_cast<T *>(c)) {
         if (pred(t_c)) {
           (t_c->*f)(args...);

diff --git a/graphics/vsrtl_view.cpp b/graphics/vsrtl_view.cpp
@@ -19,7 +19,7 @@ VSRTLView::VSRTLView(QWidget *parent) : QGraphicsView(parent) {
 
 ComponentGraphic *VSRTLView::lookupGraphicForComponent(const SimComponent *c) {
   const auto sceneItems = items();
-  for (auto *i : qAsConst(sceneItems)) {
+  for (auto *i : std::as_const(sceneItems)) {
     auto d = dynamic_cast<ComponentGraphic *>(i);
     if (d) {
       // Equality is based on pointer equality

diff --git a/graphics/vsrtl_widget.cpp b/graphics/vsrtl_widget.cpp
@@ -95,7 +95,7 @@ void VSRTLWidget::handleSceneSelectionChanged() {
   std::vector<SimComponent *> selectedComponents;
   std::vector<SimPort *> selectedPorts;
   const auto selectedItems = m_scene->selectedItems();
-  for (auto *i : qAsConst(selectedItems)) {
+  for (auto *i : std::as_const(selectedItems)) {
     ComponentGraphic *i_c = dynamic_cast<ComponentGraphic *>(i);
     if (i_c) {
       selectedComponents.push_back(i_c->getComponent());
@@ -191,7 +191,7 @@ void VSRTLWidget::sync() {
   // tell all labels to reset their text value, given that labels manually must
   // have their text updated (ie. text is not updated in the redraw call).
   const auto sceneItems = m_scene->items();
-  for (auto *item : qAsConst(sceneItems)) {
+  for (auto *item : std::as_const(sceneItems)) {
     if (auto *simobject = dynamic_cast<SimQObject *>(item)) {
       simobject->simUpdateSlot();
     }