From d84d7d36afbb2b0807ceb54e6f01ad00aae5bf39 Mon Sep 17 00:00:00 2001 From: Lu YaNing Date: Wed, 7 Dec 2022 10:36:37 +0800 Subject: [PATCH] Clean up dead code Amends commit ce73b4db62574fc966192e6a4f65b7e2b2280e38 Change-Id: I4ed0fc817882e06b16aa9eed959d4a10730d37ac Reviewed-by: Volker Hilsheimer --- src/widgets/itemviews/qtreeview.cpp | 5 ++--- src/widgets/widgets/qmdisubwindow.cpp | 24 ++++++++++-------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 065c42d6b7..2280cdaa2e 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -2192,9 +2192,8 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie } return QModelIndex(); } - int vi = -1; - if (vi < 0) - vi = qMax(0, d->viewIndex(current)); + + const int vi = qMax(0, d->viewIndex(current)); if (isRightToLeft()) { if (cursorAction == MoveRight) diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index ef1cab998f..d8700e3df2 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -1914,20 +1914,16 @@ QPalette QMdiSubWindowPrivate::desktopPalette() const Q_Q(const QMdiSubWindow); QPalette newPalette = q->palette(); - bool colorsInitialized = false; - - if (!colorsInitialized) { - newPalette.setColor(QPalette::Active, QPalette::Highlight, - newPalette.color(QPalette::Active, QPalette::Highlight)); - newPalette.setColor(QPalette::Active, QPalette::Base, - newPalette.color(QPalette::Active, QPalette::Highlight)); - newPalette.setColor(QPalette::Inactive, QPalette::Highlight, - newPalette.color(QPalette::Inactive, QPalette::Dark)); - newPalette.setColor(QPalette::Inactive, QPalette::Base, - newPalette.color(QPalette::Inactive, QPalette::Dark)); - newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText, - newPalette.color(QPalette::Inactive, QPalette::Window)); - } + newPalette.setColor(QPalette::Active, QPalette::Highlight, + newPalette.color(QPalette::Active, QPalette::Highlight)); + newPalette.setColor(QPalette::Active, QPalette::Base, + newPalette.color(QPalette::Active, QPalette::Highlight)); + newPalette.setColor(QPalette::Inactive, QPalette::Highlight, + newPalette.color(QPalette::Inactive, QPalette::Dark)); + newPalette.setColor(QPalette::Inactive, QPalette::Base, + newPalette.color(QPalette::Inactive, QPalette::Dark)); + newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText, + newPalette.color(QPalette::Inactive, QPalette::Window)); return newPalette; }