summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-06-13 12:52:47 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-06-13 12:52:47 +0000
commit92053aa9ea8476eab8a853719b59b492f50610d9 (patch)
tree8989076f6831b9c1d00504e0c6c40cc864bb0f73 /src
parentFix CI problem (diff)
downloadinkscape-92053aa9ea8476eab8a853719b59b492f50610d9.tar.gz
inkscape-92053aa9ea8476eab8a853719b59b492f50610d9.zip
fix coding style
Diffstat (limited to 'src')
-rw-r--r--src/ui/widget/combo-enums.h5
-rw-r--r--src/ui/widget/spinbutton.cpp2
-rw-r--r--src/ui/widget/spinbutton.h4
-rw-r--r--src/ui/widget/unit-menu.cpp5
-rw-r--r--src/ui/widget/unit-menu.h2
5 files changed, 6 insertions, 12 deletions
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index 8ceca1da7..d57410646 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -155,10 +155,7 @@ public:
}
};
- bool on_scroll_event(GdkEventScroll* event) override
- {
- return false;
- }
+ bool on_scroll_event(GdkEventScroll *event) override { return false; }
void set_active_by_key(const Glib::ustring& key) {
setProgrammatically = true;
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 48da5c8f5..c633035cf 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -85,7 +85,7 @@ bool SpinButton::on_scroll_event(GdkEventScroll *event)
} else if (event->direction == GDK_SCROLL_DOWN) {
change = -step;
} else if (event->direction == GDK_SCROLL_SMOOTH) {
- double delta_y_clamped = CLAMP(event->delta_y, -1 , 1); // values > 1 result in excessive changes
+ double delta_y_clamped = CLAMP(event->delta_y, -1, 1); // values > 1 result in excessive changes
change = step * -delta_y_clamped;
} else {
return false;
diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h
index 83015fb4a..710b511b1 100644
--- a/src/ui/widget/spinbutton.h
+++ b/src/ui/widget/spinbutton.h
@@ -82,9 +82,9 @@ protected:
/**
* When scroll is done.
* @retval false continue with default handler.
- * @retval true don't call default handler.
+ * @retval true don't call default handler.
*/
- bool on_scroll_event(GdkEventScroll* event) override;
+ bool on_scroll_event(GdkEventScroll *event) override;
/**
* Handle specific keypress events, like Ctrl+Z.
*
diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index 4648c6f7c..aaf565fad 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -134,10 +134,7 @@ bool UnitMenu::isRadial() const
return getUnitType() == UNIT_TYPE_RADIAL;
}
-bool UnitMenu::on_scroll_event(GdkEventScroll* event)
-{
- return false;
-}
+bool UnitMenu::on_scroll_event(GdkEventScroll *event) { return false; }
} // namespace Widget
} // namespace UI
diff --git a/src/ui/widget/unit-menu.h b/src/ui/widget/unit-menu.h
index d92fa2d11..b8e3ab7fa 100644
--- a/src/ui/widget/unit-menu.h
+++ b/src/ui/widget/unit-menu.h
@@ -125,7 +125,7 @@ protected:
/**
* block scroll from widget if is inside a scrolled window.
*/
- bool on_scroll_event(GdkEventScroll* event) override;
+ bool on_scroll_event(GdkEventScroll *event) override;
};
} // namespace Widget