feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't use return keyword when not necessary

Browse Source 
Change-Id: I4b9fad1eee60e942ddbccda53a4af27e978df498
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Montel Laurent
2017-04-14 12:06:24 +02:00
committed by Laurent Montel
parent 660c4ced86
commit f18ae4ff6f
10 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -231,12 +231,12 @@ QPalette ManhattanStyle::standardPalette() const
void ManhattanStyle::polish(QApplication *app)
{
return QProxyStyle::polish(app);
QProxyStyle::polish(app);
}
void ManhattanStyle::unpolish(QApplication *app)
{
return QProxyStyle::unpolish(app);
QProxyStyle::unpolish(app);
}
QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false)
@@ -381,8 +381,10 @@ int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const
void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const
{
if (!panelWidget(widget))
return QProxyStyle::drawPrimitive(element, option, painter, widget);
if (!panelWidget(widget)) {
QProxyStyle::drawPrimitive(element, option, painter, widget);
return;
}
bool animating = (option->state & State_Animating);
int state = option->state;
@@ -614,8 +616,10 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const
{
if (!panelWidget(widget) && !qobject_cast<const QMenu *>(widget))
return QProxyStyle::drawControl(element, option, painter, widget);
if (!panelWidget(widget) && !qobject_cast<const QMenu *>(widget)) {
QProxyStyle::drawControl(element, option, painter, widget);
return;
}
switch (element) {
case CE_MenuItem: