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