Disable QT keywords to avoid clashes with other libraries. (#5882)
This commit is contained in:
@@ -136,7 +136,7 @@ ColorPickerDialog::ColorPickerDialog(QColor color, QWidget *parent)
|
||||
new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
|
||||
QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, [this] {
|
||||
emit this->colorConfirmed(this->color());
|
||||
this->colorConfirmed(this->color());
|
||||
this->close();
|
||||
});
|
||||
QObject::connect(buttonBox, &QDialogButtonBox::rejected, this,
|
||||
@@ -156,7 +156,7 @@ void ColorPickerDialog::setColor(const QColor &color)
|
||||
return;
|
||||
}
|
||||
this->color_ = color;
|
||||
emit this->colorChanged(color);
|
||||
this->colorChanged(color);
|
||||
}
|
||||
|
||||
} // namespace chatterino
|
||||
|
||||
@@ -13,11 +13,11 @@ public:
|
||||
|
||||
QColor color() const;
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void colorChanged(QColor color);
|
||||
void colorConfirmed(QColor color);
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void setColor(const QColor &color);
|
||||
|
||||
private:
|
||||
|
||||
@@ -25,7 +25,7 @@ public:
|
||||
|
||||
std::shared_ptr<Hotkey> data();
|
||||
|
||||
protected slots:
|
||||
protected Q_SLOTS:
|
||||
/**
|
||||
* @brief validates the hotkey
|
||||
*
|
||||
|
||||
@@ -26,7 +26,7 @@ public:
|
||||
protected:
|
||||
void themeChangedEvent() override;
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void updateSuggestions(const QString &text);
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user