From a23f60535038750ea3af664ffc26faf1e970a5c7 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 22 Jun 2019 15:43:09 +0200
Subject: [PATCH] [App] Color; Replace overload with defaulted arg.
---
Applications/DataHolderLib/Color.cpp | 5 -----
Applications/DataHolderLib/Color.h | 7 ++++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Applications/DataHolderLib/Color.cpp b/Applications/DataHolderLib/Color.cpp
index d8d313d858a..2d786ddf1fb 100644
--- a/Applications/DataHolderLib/Color.cpp
+++ b/Applications/DataHolderLib/Color.cpp
@@ -18,11 +18,6 @@
namespace DataHolderLib {
-Color createColor(unsigned char r, unsigned char g, unsigned char b)
-{
- return Color{{r,g,b,255}};
-}
-
Color createColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
{
return Color{{r,g,b,a}};
diff --git a/Applications/DataHolderLib/Color.h b/Applications/DataHolderLib/Color.h
index 08bec262e85..235cfa86875 100644
--- a/Applications/DataHolderLib/Color.h
+++ b/Applications/DataHolderLib/Color.h
@@ -23,9 +23,10 @@ namespace DataHolderLib
{
using Color = std::array<unsigned char, 4>;
-Color createColor(unsigned char r, unsigned char g, unsigned char b);
-
-Color createColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+Color createColor(unsigned char r,
+ unsigned char g,
+ unsigned char b,
+ unsigned char a = 255);
/// Returns a random RGB colour.
Color getRandomColor();
--
GitLab