diff --git a/capture/button.cpp b/capture/button.cpp index 60c6b0b7..3894f2ac 100644 --- a/capture/button.cpp +++ b/capture/button.cpp @@ -28,7 +28,7 @@ namespace { const int BUTTON_SIZE = 30; } -Button::Button(Type t, QWidget *parent) : QPushButton(parent), +Button::Button(const Type t, QWidget *parent) : QPushButton(parent), m_buttonType(t) { initButton(); @@ -40,8 +40,8 @@ Button::Button(Type t, QWidget *parent) : QPushButton(parent), } } -Button::Button(Button::Type t, bool isWhite, QWidget *parent) : QPushButton(parent), - m_buttonType(t) { +Button::Button(const Button::Type t, const bool isWhite, QWidget *parent) + : QPushButton(parent), m_buttonType(t) { initButton(); if (t == Button::Type::selectionIndicator) { @@ -142,7 +142,7 @@ QString Button::getStyle() { return getStyle(mainColor); } -QString Button::getStyle(QColor mainColor) { +QString Button::getStyle(const QColor &mainColor) { QString baseSheet = "Button { border-radius: 15px;" "background-color: %1; color: white }" "Button:hover { background-color: %2; }" @@ -199,7 +199,7 @@ size_t Button::getButtonBaseSize() { } // getTypeByName receives a name and return the corresponding button type. // returns Button::Type::last when the corresponding button is not found. -Button::Type Button::getTypeByName(QString s) { +Button::Type Button::getTypeByName(const QString s) { Button::Type res = Type::last; for (auto it = typeName.begin(); it != typeName.end(); ++it ) if (it->second == s) @@ -207,11 +207,11 @@ Button::Type Button::getTypeByName(QString s) { return res; } -QString Button::getTypeName(Button::Type t) { +QString Button::getTypeName(const Button::Type t) { return typeName[t]; } -QString Button::getTypeTooltip(Button::Type t) { +QString Button::getTypeTooltip(const Button::Type t) { return typeTooltip[t]; } diff --git a/capture/button.h b/capture/button.h index 717d5b69..72fd9468 100644 --- a/capture/button.h +++ b/capture/button.h @@ -49,17 +49,17 @@ public: colorPicker }; - explicit Button(Type, QWidget *parent = 0); - explicit Button(Type, bool isWhite, QWidget *parent = 0); + explicit Button(const Type, QWidget *parent = 0); + explicit Button(const Type, const bool isWhite, QWidget *parent = 0); static QIcon getIcon(const Type); static QIcon getIcon(const Type, bool isWhite); static QString getStyle(); - static QString getStyle(QColor); + static QString getStyle(const QColor &); static size_t getButtonBaseSize(); - static Button::Type getTypeByName(QString); - static QString getTypeName(Button::Type); - static QString getTypeTooltip(Button::Type); + static Button::Type getTypeByName(const QString); + static QString getTypeName(const Button::Type); + static QString getTypeTooltip(const Button::Type); Type getButtonType() const; diff --git a/capture/buttonhandler.cpp b/capture/buttonhandler.cpp index 2a9258c1..03b882a4 100644 --- a/capture/buttonhandler.cpp +++ b/capture/buttonhandler.cpp @@ -296,7 +296,7 @@ QVector ButtonHandler::getVPoints( return res; } // setButtons redefines the buttons of the button handler -void ButtonHandler::setButtons(QVector