changeset 33597:1a479e04f2a6

use range-based for loop instead of Qt foreach macro * TerminalView.cpp: (QRegion TerminalView::hotSpotRegion, TerminalView::dropEvent): Replace foreach with range based for loop. (TerminalView::paintEvent): If HAVE_QREGION_ITERATORS is not defined, use Q_FOREACH instead of foreach. * QWinTerminalImpl.cpp (QWinTerminalImpl::dropEvent): Replace foreach with range based for loop. * gui-utils.cc (adjust_to_screen): Replace foreach with range based for loop.
author John W. Eaton <jwe@octave.org>
date Sat, 18 May 2024 10:36:35 -0400
parents e8e951bcf701
children 02d01047b6fe
files libgui/qterminal/libqterminal/unix/TerminalView.cpp libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp libgui/src/gui-utils.cc
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Fri May 17 16:49:20 2024 -0400
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Sat May 18 10:36:35 2024 -0400
@@ -664,7 +664,7 @@
 QRegion TerminalView::hotSpotRegion() const
 {
   QRegion region;
-  foreach( Filter::HotSpot* hotSpot , _filterChain->hotSpots() )
+  for( Filter::HotSpot* hotSpot : _filterChain->hotSpots() )
     {
       QRect rect;
       rect.setLeft(hotSpot->startColumn());
@@ -943,7 +943,7 @@
 #if defined (HAVE_QREGION_ITERATORS)
   for (QRect rect : (pe->region() & contentsRect()))
 #else
-  foreach (QRect rect, (pe->region() & contentsRect()).rects())
+  Q_FOREACH (QRect rect : (pe->region() & contentsRect()).rects())
 #endif
     {
       drawBackground(paint,rect,palette().window().color());
@@ -2531,7 +2531,7 @@
 
   if (event->mimeData ()->hasUrls ())
   {
-    foreach (QUrl url, event->mimeData ()->urls ())
+    for (QUrl url : event->mimeData ()->urls ())
     {
       if(dropText.length () > 0)
         dropText += '\n';
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri May 17 16:49:20 2024 -0400
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Sat May 18 10:36:35 2024 -0400
@@ -1917,7 +1917,7 @@
 
   if (event->mimeData ()->hasUrls ())
     {
-      foreach (QUrl url, event->mimeData ()->urls ())
+      for (QUrl url : event->mimeData ()->urls ())
         {
           if(dropText.length () > 0)
             dropText += '\n';
--- a/libgui/src/gui-utils.cc	Fri May 17 16:49:20 2024 -0400
+++ b/libgui/src/gui-utils.cc	Sat May 18 10:36:35 2024 -0400
@@ -74,7 +74,7 @@
     = actual_geometry.width () * actual_geometry.height ();
   QRect intersection;
 
-  foreach (const QScreen *screen, QGuiApplication::screens ())
+  for (const QScreen *screen : QGuiApplication::screens ())
     {
       QRect screen_geom = screen->availableGeometry ();
       intersection = screen_geom.intersected (actual_geometry);