replaced signals and slots with Q_SIGNALS and Q_SLOTS to avoid conflicts

with boost signals

enterpassworddialog/enterpassworddialog.h

@@ -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();

settingsdialog/optioncategory.h

@@ -32,7 +32,7 @@ public:
     void resetAllPages();
     bool matches(const QString &searchKeyWord) const;
     
-signals:
+Q_SIGNALS:
     void displayNameChanged();
     void iconChanged();
     void pagesChanged();

settingsdialog/optioncategorymodel.h

@@ -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();
     

settingsdialog/settingsdialog.h

@@ -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();
 

widgets/clearcombobox.h

@@ -17,7 +17,7 @@ public:
     ~ClearComboBox();
     bool isCleared() const;
     
-private slots:
+private Q_SLOTS:
     void handleTextChanged(const QString &text);
     void handleClearButtonClicked();
     

widgets/clearlineedit.h

@@ -23,7 +23,7 @@ public:
     ~ClearLineEdit();
     bool isCleared() const;
     
-private slots:
+private Q_SLOTS:
     void handleTextChanged(const QString &text);
     void handleClearButtonClicked();
 };

widgets/clearplaintextedit.h

@@ -15,7 +15,7 @@ public:
     ~ClearPlainTextEdit();
     bool isCleared() const;
 
-private slots:
+private Q_SLOTS:
     void handleTextChanged();
     void handleClearButtonClicked();
 

widgets/clearspinbox.h

@@ -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();