From c4d43b3fbc5238ff50838faba1e02ea6d0f4df41 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Tue, 28 Aug 2018 19:43:59 +0200
Subject: [PATCH] CR fixes
---
interface/resources/qml/InteractiveWindow.qml | 2 +-
libraries/ui/src/MainWindow.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/resources/qml/InteractiveWindow.qml b/interface/resources/qml/InteractiveWindow.qml
index 1c41dd189b..e8ddbf823d 100644
--- a/interface/resources/qml/InteractiveWindow.qml
+++ b/interface/resources/qml/InteractiveWindow.qml
@@ -147,7 +147,7 @@ Windows.Window {
Qt.WindowMaximizeButtonHint |
Qt.WindowMinimizeButtonHint;
// only use the always on top feature for non Windows OS
- if (Qt.platform.os !== "windows" && (flags & Desktop.ALWAYS_ON_TOP) === Desktop.ALWAYS_ON_TOP) {
+ if (Qt.platform.os !== "windows" && (flags & Desktop.ALWAYS_ON_TOP)) {
nativeWindowFlags |= Qt.WindowStaysOnTopHint;
}
nativeWindow.flags = nativeWindowFlags;
diff --git a/libraries/ui/src/MainWindow.cpp b/libraries/ui/src/MainWindow.cpp
index 1a13194974..680433b2f9 100644
--- a/libraries/ui/src/MainWindow.cpp
+++ b/libraries/ui/src/MainWindow.cpp
@@ -43,7 +43,7 @@ MainWindow::~MainWindow() {
QWindow* MainWindow::findMainWindow() {
auto windows = qApp->topLevelWindows();
QWindow* result = nullptr;
- for (auto window : windows) {
+ for (const auto& window : windows) {
if (window->objectName().contains("MainWindow")) {
result = window;
break;