mirror of
https://github.com/transmission/transmission.git
synced 2026-05-08 09:39:08 +01:00
Adjust uncrustify config, reformat all but Mac client
There're places where manual intervention is still required as uncrustify is not ideal (unfortunately), but at least one may rely on it to do the right thing most of the time (e.g. when sending in a patch). The style itself is quite different from what we had before but making it uniform across all the codebase is the key. I also hope that it'll make the code more readable (YMMV) and less sensitive to further changes.
This commit is contained in:
+16
-17
@@ -13,29 +13,28 @@
|
||||
|
||||
#include "IconToolButton.h"
|
||||
|
||||
IconToolButton::IconToolButton (QWidget * parent):
|
||||
QToolButton (parent)
|
||||
IconToolButton::IconToolButton(QWidget* parent) :
|
||||
QToolButton(parent)
|
||||
{
|
||||
}
|
||||
|
||||
QSize
|
||||
IconToolButton::sizeHint () const
|
||||
QSize IconToolButton::sizeHint() const
|
||||
{
|
||||
QStyleOptionToolButton option;
|
||||
initStyleOption (&option);
|
||||
option.features = QStyleOptionToolButton::None;
|
||||
option.toolButtonStyle = Qt::ToolButtonIconOnly;
|
||||
const QSize size = style ()->sizeFromContents (QStyle::CT_ToolButton, &option, iconSize (), this);
|
||||
QStyleOptionToolButton option;
|
||||
initStyleOption(&option);
|
||||
option.features = QStyleOptionToolButton::None;
|
||||
option.toolButtonStyle = Qt::ToolButtonIconOnly;
|
||||
const QSize size = style()->sizeFromContents(QStyle::CT_ToolButton, &option, iconSize(), this);
|
||||
|
||||
return size.expandedTo (iconSize () + QSize (8, 8));
|
||||
return size.expandedTo(iconSize() + QSize(8, 8));
|
||||
}
|
||||
|
||||
void IconToolButton::paintEvent (QPaintEvent * /*event*/)
|
||||
void IconToolButton::paintEvent(QPaintEvent* /*event*/)
|
||||
{
|
||||
QStylePainter painter(this);
|
||||
QStyleOptionToolButton option;
|
||||
initStyleOption (&option);
|
||||
option.features = QStyleOptionToolButton::None;
|
||||
option.toolButtonStyle = Qt::ToolButtonIconOnly;
|
||||
painter.drawComplexControl(QStyle::CC_ToolButton, option);
|
||||
QStylePainter painter(this);
|
||||
QStyleOptionToolButton option;
|
||||
initStyleOption(&option);
|
||||
option.features = QStyleOptionToolButton::None;
|
||||
option.toolButtonStyle = Qt::ToolButtonIconOnly;
|
||||
painter.drawComplexControl(QStyle::CC_ToolButton, option);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user