replaced signals and slots with Q_SIGNALS and Q_SLOTS to avoid conflicts
with boost signals
This commit is contained in:
parent
e5b84fb8d0
commit
89f3822f09
|
@ -48,7 +48,7 @@ protected:
|
|||
bool event(QEvent *event);
|
||||
bool eventFilter(QObject *sender, QEvent *event);
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void updateShowPassword();
|
||||
void confirm();
|
||||
void abort();
|
||||
|
|
|
@ -32,7 +32,7 @@ public:
|
|||
void resetAllPages();
|
||||
bool matches(const QString &searchKeyWord) const;
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void displayNameChanged();
|
||||
void iconChanged();
|
||||
void pagesChanged();
|
||||
|
|
|
@ -26,7 +26,7 @@ public:
|
|||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void categoryChangedName();
|
||||
void categoryChangedIcon();
|
||||
|
||||
|
|
|
@ -32,14 +32,14 @@ public:
|
|||
OptionCategory *category(int categoryIndex) const;
|
||||
OptionPage *page(int categoryIndex, int pageIndex) const;
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void applied();
|
||||
void resetted();
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent *event);
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void currentCategoryChanged(const QModelIndex &index);
|
||||
void updateTabWidget();
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ public:
|
|||
~ClearComboBox();
|
||||
bool isCleared() const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleTextChanged(const QString &text);
|
||||
void handleClearButtonClicked();
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ public:
|
|||
~ClearLineEdit();
|
||||
bool isCleared() const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleTextChanged(const QString &text);
|
||||
void handleClearButtonClicked();
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@ public:
|
|||
~ClearPlainTextEdit();
|
||||
bool isCleared() const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleTextChanged();
|
||||
void handleClearButtonClicked();
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ protected:
|
|||
int valueFromText(const QString &text) const;
|
||||
QString textFromValue(int val) const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleValueChanged(int value);
|
||||
void handleClearButtonClicked();
|
||||
|
||||
|
|
Loading…
Reference in New Issue