From 4eb483a549a363f3914a1c7d96e3932aa327fcb3 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 22 Jun 2020 14:36:35 +0200 Subject: [PATCH] Fixes by clang-format --- Fwk/AppFwk/CommonCode/cafColorTable.cpp | 10 +++++----- Fwk/AppFwk/CommonCode/cafColorTable.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Fwk/AppFwk/CommonCode/cafColorTable.cpp b/Fwk/AppFwk/CommonCode/cafColorTable.cpp index b277e9c0e1..3aefff1fe0 100644 --- a/Fwk/AppFwk/CommonCode/cafColorTable.cpp +++ b/Fwk/AppFwk/CommonCode/cafColorTable.cpp @@ -132,24 +132,24 @@ caf::ColorTable ColorTable::inverted() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool ColorTable::contains(const cvf::Color3ub& color) const +bool ColorTable::contains( const cvf::Color3ub& color ) const { - auto it = std::find(m_colors.begin(), m_colors.end(), color); + auto it = std::find( m_colors.begin(), m_colors.end(), color ); return it != m_colors.end(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool ColorTable::contains(const cvf::Color3f& color) const +bool ColorTable::contains( const cvf::Color3f& color ) const { - return contains(cvf::Color3ub(color)); + return contains( cvf::Color3ub( color ) ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Color3ub ColorTable::fromQColor(const QColor& color) +cvf::Color3ub ColorTable::fromQColor( const QColor& color ) { return cvf::Color3ub( color.red(), color.green(), color.blue() ); } diff --git a/Fwk/AppFwk/CommonCode/cafColorTable.h b/Fwk/AppFwk/CommonCode/cafColorTable.h index 9496902c27..f1a489dcb8 100644 --- a/Fwk/AppFwk/CommonCode/cafColorTable.h +++ b/Fwk/AppFwk/CommonCode/cafColorTable.h @@ -67,11 +67,11 @@ public: ColorTable inverted() const; - bool contains(const cvf::Color3ub& color) const; - bool contains(const cvf::Color3f& color) const; + bool contains( const cvf::Color3ub& color ) const; + bool contains( const cvf::Color3f& color ) const; - static cvf::Color3ub fromQColor(const QColor& color); - static cvf::Color3ubArray interpolateColorArray(const cvf::Color3ubArray& colorArray, size_t targetColorCount); + static cvf::Color3ub fromQColor( const QColor& color ); + static cvf::Color3ubArray interpolateColorArray( const cvf::Color3ubArray& colorArray, size_t targetColorCount ); private: const std::vector m_colors;