diff --git a/CMakeLists.txt b/CMakeLists.txt index 014b755..b077d6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ include(CMakePackageConfigHelpers) include(CheckFunctionExists) include(CheckIncludeFile) -set(REQUIRED_QT_VERSION "5.6") -set(LXQTBT_MINIMUM_VERSION "0.4.0") +set(REQUIRED_QT_VERSION "5.7.1") +set(LXQTBT_MINIMUM_VERSION "0.4.1") option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) option(BUILD_EXAMPLE "Build example application. Default OFF." OFF) @@ -201,6 +201,7 @@ target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME} "TRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\"" "HAVE_POSIX_OPENPT" "HAVE_SYS_TIME_H" + "QT_NO_FOREACH" ) diff --git a/lib/Emulation.cpp b/lib/Emulation.cpp index 2dfb956..8140ba2 100644 --- a/lib/Emulation.cpp +++ b/lib/Emulation.cpp @@ -132,7 +132,7 @@ void Emulation::setScreen(int n) if (_currentScreen != old) { // tell all windows onto this emulation to switch to the newly active screen - foreach(ScreenWindow* window,_windows) + for(ScreenWindow* window : const_cast&>(_windows)) window->setScreen(_currentScreen); } } diff --git a/lib/ShellCommand.cpp b/lib/ShellCommand.cpp index 210285c..ee7104e 100644 --- a/lib/ShellCommand.cpp +++ b/lib/ShellCommand.cpp @@ -96,7 +96,7 @@ QStringList ShellCommand::expand(const QStringList & items) { QStringList result; - foreach(const QString &item, items ) { + for(const QString &item : items) { result << expand(item); } diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index 3e93f13..e13b085 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -1028,7 +1028,8 @@ void TerminalDisplay::scrollImage(int lines , const QRect& screenWindowRegion) QRegion TerminalDisplay::hotSpotRegion() const { QRegion region; - foreach( Filter::HotSpot* hotSpot , _filterChain->hotSpots() ) + const auto hotSpots = _filterChain->hotSpots(); + for( Filter::HotSpot* const hotSpot : hotSpots ) { QRect r; if (hotSpot->startLine()==hotSpot->endLine()) { @@ -1377,7 +1378,8 @@ void TerminalDisplay::paintEvent( QPaintEvent* pe ) } else { - foreach (const QRect &rect, (pe->region() & contentsRect()).rects()) + const auto rects = (pe->region() & contentsRect()).rects(); + for (const QRect &rect : rects) { drawBackground(paint,rect,palette().background().color(), true /* use opacity setting */); diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 40ebb92..1136459 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -474,7 +474,8 @@ void QTermWidget::setColorScheme(const QString& origName) QStringList QTermWidget::availableColorSchemes() { QStringList ret; - foreach (const ColorScheme* cs, ColorSchemeManager::instance()->allColorSchemes()) + const auto allColorSchemes = ColorSchemeManager::instance()->allColorSchemes(); + for (const ColorScheme* cs : allColorSchemes) ret.append(cs->name()); return ret; }