Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swift/QtUI/QtColorToolButton.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swift/QtUI/QtColorToolButton.cpp')
| -rw-r--r-- | Swift/QtUI/QtColorToolButton.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Swift/QtUI/QtColorToolButton.cpp b/Swift/QtUI/QtColorToolButton.cpp index a91fe0e..b349a47 100644 --- a/Swift/QtUI/QtColorToolButton.cpp +++ b/Swift/QtUI/QtColorToolButton.cpp @@ -18,34 +18,34 @@ namespace Swift { QtColorToolButton::QtColorToolButton(QWidget* parent) : - QToolButton(parent) + QToolButton(parent) { - connect(this, SIGNAL(clicked()), SLOT(onClicked())); - setColorIcon(Qt::transparent); + connect(this, SIGNAL(clicked()), SLOT(onClicked())); + setColorIcon(Qt::transparent); } void QtColorToolButton::setColor(const QColor& color) { - if (color.isValid() != color_.isValid() || (color.isValid() && color != color_)) { - color_ = color; - setColorIcon(color_); - emit colorChanged(color_); - } + if (color.isValid() != color_.isValid() || (color.isValid() && color != color_)) { + color_ = color; + setColorIcon(color_); + emit colorChanged(color_); + } } void QtColorToolButton::onClicked() { - QColor c = QColorDialog::getColor(color_, this); - if (c.isValid()) { - setColor(c); - } + QColor c = QColorDialog::getColor(color_, this); + if (c.isValid()) { + setColor(c); + } } void QtColorToolButton::setColorIcon(const QColor& color) { - QPixmap pix(iconSize()); - pix.fill(color.isValid() ? color : Qt::transparent); - setIcon(pix); + QPixmap pix(iconSize()); + pix.fill(color.isValid() ? color : Qt::transparent); + setIcon(pix); } } |