whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up dead code 

Amends commit ce73b4db62

Change-Id: I4ed0fc817882e06b16aa9eed959d4a10730d37ac
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Lu YaNing 2022-12-07 10:36:37 +08:00
parent 0f5af511ea
commit d84d7d36af
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/itemviews/qtreeview.cpp
View File

@ -2192,9 +2192,8 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
} }
return QModelIndex(); return QModelIndex();
} }
int vi = -1;
if (vi < 0) const int vi = qMax(0, d->viewIndex(current));
vi = qMax(0, d->viewIndex(current));
if (isRightToLeft()) { if (isRightToLeft()) {
if (cursorAction == MoveRight) if (cursorAction == MoveRight)

24
src/widgets/widgets/qmdisubwindow.cpp
View File

@ -1914,20 +1914,16 @@ QPalette QMdiSubWindowPrivate::desktopPalette() const
Q_Q(const QMdiSubWindow); Q_Q(const QMdiSubWindow);
QPalette newPalette = q->palette(); QPalette newPalette = q->palette();
bool colorsInitialized = false; newPalette.setColor(QPalette::Active, QPalette::Highlight,
newPalette.color(QPalette::Active, QPalette::Highlight));
if (!colorsInitialized) { newPalette.setColor(QPalette::Active, QPalette::Base,
newPalette.setColor(QPalette::Active, QPalette::Highlight, newPalette.color(QPalette::Active, QPalette::Highlight));
newPalette.color(QPalette::Active, QPalette::Highlight)); newPalette.setColor(QPalette::Inactive, QPalette::Highlight,
newPalette.setColor(QPalette::Active, QPalette::Base, newPalette.color(QPalette::Inactive, QPalette::Dark));
newPalette.color(QPalette::Active, QPalette::Highlight)); newPalette.setColor(QPalette::Inactive, QPalette::Base,
newPalette.setColor(QPalette::Inactive, QPalette::Highlight, newPalette.color(QPalette::Inactive, QPalette::Dark));
newPalette.color(QPalette::Inactive, QPalette::Dark)); newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText,
newPalette.setColor(QPalette::Inactive, QPalette::Base, newPalette.color(QPalette::Inactive, QPalette::Window));
newPalette.color(QPalette::Inactive, QPalette::Dark));
newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText,
newPalette.color(QPalette::Inactive, QPalette::Window));
}
return newPalette; return newPalette;
} }