Merge branch 'dev-variable-refractor' into dev

This commit is contained in:
2019-12-20 10:13:59 +01:00
23 changed files with 154 additions and 153 deletions

View File

@@ -9,7 +9,7 @@ IntelliColorPicker::~IntelliColorPicker(){
}
void IntelliColorPicker::switchColors(){
void IntelliColorPicker::swapColors(){
std::swap(firstColor, secondColor);
}

View File

@@ -23,7 +23,7 @@ virtual ~IntelliColorPicker();
/*!
* \brief A function switching primary and secondary color.
*/
void switchColors();
void swapColors();
/*!
* \brief A function to read the primary selected color.