Disable QT keywords to avoid clashes with other libraries. (#5882)

This commit is contained in:
cmp
2025-02-02 04:08:11 -06:00
committed by GitHub
parent f629eecaa7
commit 65e97846aa
37 changed files with 51 additions and 49 deletions
+1 -1
View File
@@ -156,7 +156,7 @@ void AlphaSlider::setAlpha(int alpha)
this->alpha_ = alpha;
this->color_.setAlpha(alpha);
emit this->colorChanged(this->color_);
this->colorChanged(this->color_);
this->update();
}
+2 -2
View File
@@ -15,10 +15,10 @@ public:
int alpha() const;
signals:
Q_SIGNALS:
void colorChanged(QColor color) const;
public slots:
public Q_SLOTS:
void setColor(QColor color);
protected:
+1 -1
View File
@@ -16,7 +16,7 @@ public:
QColor color() const;
// NOLINTNEXTLINE(readability-redundant-access-specifiers)
public slots:
public Q_SLOTS:
void setColor(const QColor &color);
protected:
+1 -1
View File
@@ -162,7 +162,7 @@ void ColorInput::emitUpdate()
{
this->updateComponents();
// our components triggered this update, emit the new color
emit this->colorChanged(this->currentColor_);
this->colorChanged(this->currentColor_);
}
} // namespace chatterino
+2 -2
View File
@@ -17,10 +17,10 @@ public:
QColor color() const;
signals:
Q_SIGNALS:
void colorChanged(QColor color);
public slots:
public Q_SLOTS:
void setColor(QColor color);
private:
+1 -1
View File
@@ -158,7 +158,7 @@ void HueSlider::setHue(int hue)
this->color_.getHsv(&h, &s, &v, &a);
this->color_.setHsv(this->hue_, s, v, a);
emit this->colorChanged(this->color_);
this->colorChanged(this->color_);
this->update();
}
+2 -2
View File
@@ -15,10 +15,10 @@ public:
int hue() const;
signals:
Q_SIGNALS:
void colorChanged(QColor color) const;
public slots:
public Q_SLOTS:
void setColor(QColor color);
protected:
+1 -1
View File
@@ -186,7 +186,7 @@ void SBCanvas::emitUpdatedColor()
{
this->color_.setHsv(this->hue_, this->saturation_, this->brightness_,
this->color_.alpha());
emit this->colorChanged(this->color_);
this->colorChanged(this->color_);
}
} // namespace chatterino
+2 -2
View File
@@ -17,10 +17,10 @@ public:
int saturation() const;
int brightness() const;
signals:
Q_SIGNALS:
void colorChanged(QColor color) const;
public slots:
public Q_SLOTS:
void setColor(QColor color);
protected: