From f2c0fead1864443d16eb0b04cd973f0955b27f7e Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 18 Jul 2017 16:21:50 +0200 Subject: widgets: remove redundant check in QMenu::popup if (A) doA() else if (B) doB() if (B) doB() is equal to: if (A) doA() if (B) doB() when doB() is a self-contained basic operation like QRect::setY(int ay) with { y1 = ay; } as body. Change-Id: I3421493fe47459bd9b3d4cb5f4cfdd30ce566003 Reviewed-by: Edward Welbourne --- src/widgets/widgets/qmenu.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/widgets/widgets/qmenu.cpp') diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 1b8409dba2..0d34121597 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -2430,8 +2430,6 @@ void QMenu::popup(const QPoint &p, QAction *atAction) pos.setY(qMin(mouse.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1)); else pos.setY(qMax(p.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1)); - } else if (pos.y() < screen.top() + desktopFrame) { - pos.setY(screen.top() + desktopFrame); } if (pos.y() < screen.top() + desktopFrame) -- cgit v1.2.3