summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-27 05:12:05 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-27 05:12:05 (GMT)
commitc06a7e3a6d5003615befb65977e231eb62685247 (patch)
treef912d9656e0896fb6e506c738340ee83c91f743f
parent5cae5d79c417ee46ad114685688aa4b3c94e23df (diff)
Remove more private Q_SLOTS
-rw-r--r--src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h4
-rw-r--r--src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h4
-rw-r--r--src/ksieveui/editor/sieveeditortabwidget.h3
-rw-r--r--src/ksieveui/editor/sieveeditortextmodewidget.h3
-rw-r--r--src/ksieveui/editor/sieveeditorwidget.cpp2
-rw-r--r--src/ksieveui/editor/sieveeditorwidget.h13
-rw-r--r--src/ksieveui/editor/sievetextedit.h8
7 files changed, 14 insertions, 23 deletions
diff --git a/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h b/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h
index bcf9021..91a75b6 100644
--- a/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h
+++ b/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h
@@ -37,10 +37,8 @@ Q_SIGNALS:
protected:
void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void slotTextChanged();
-
private:
+ void slotTextChanged();
void verifyAddress();
QString mNegativeBackground;
bool mIncorrectEmail;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h
index ddeb71a..7ef0cb8 100644
--- a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h
+++ b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h
@@ -70,10 +70,8 @@ public:
Q_SIGNALS:
void valueChanged();
-private Q_SLOTS:
- void slotSelectFlags();
-
private:
+ void slotSelectFlags();
QLineEdit *mEdit;
};
}
diff --git a/src/ksieveui/editor/sieveeditortabwidget.h b/src/ksieveui/editor/sieveeditortabwidget.h
index 6b28aea..f4b7b7e 100644
--- a/src/ksieveui/editor/sieveeditortabwidget.h
+++ b/src/ksieveui/editor/sieveeditortabwidget.h
@@ -46,7 +46,7 @@ protected:
Q_SIGNALS:
void copyAvailable(bool);
-private Q_SLOTS:
+private:
void slotTitleChanged(KSieveUi::SieveEditorHelpHtmlWidget *widget, const QString &title);
void slotTabCloseRequested(int index);
void slotProgressIndicatorPixmapChanged(KSieveUi::SieveEditorHelpHtmlWidget *widget, const QPixmap &pixmap);
@@ -56,7 +56,6 @@ private Q_SLOTS:
void slotCloseAllTabExcept(int index);
void slotCloseAllTab();
void slotCloseRequest(int index);
-private:
void closeAllTabExcept(int index = -1);
};
}
diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.h b/src/ksieveui/editor/sieveeditortextmodewidget.h
index 5ec39a6..b84ff36 100644
--- a/src/ksieveui/editor/sieveeditortextmodewidget.h
+++ b/src/ksieveui/editor/sieveeditortextmodewidget.h
@@ -113,12 +113,11 @@ Q_SIGNALS:
public Q_SLOTS:
void slotShowGoToLine();
-private Q_SLOTS:
+private:
void slotTextChanged();
void slotFind();
void slotReplace();
void slotGoToLine(int line);
-private:
void readConfig();
void writeConfig();
bool loadFromFile(const QString &filename);
diff --git a/src/ksieveui/editor/sieveeditorwidget.cpp b/src/ksieveui/editor/sieveeditorwidget.cpp
index e54efbe..f35f2e9 100644
--- a/src/ksieveui/editor/sieveeditorwidget.cpp
+++ b/src/ksieveui/editor/sieveeditorwidget.cpp
@@ -68,7 +68,7 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWidget *parent)
toolbar->addAction(mCheckSyntax);
mSaveAs = KStandardAction::saveAs(this, &SieveEditorWidget::slotSaveAs, this);
toolbar->addAction(mSaveAs);
- toolbar->addAction(i18n("Import..."), this, SLOT(slotImport()));
+ toolbar->addAction(i18n("Import..."), this, &SieveEditorWidget::slotImport);
mCreateRulesGraphically = new QAction(i18n("Create Rules Graphically..."), this);
connect(mCreateRulesGraphically, &QAction::triggered, this, &SieveEditorWidget::slotCreateRulesGraphically);
diff --git a/src/ksieveui/editor/sieveeditorwidget.h b/src/ksieveui/editor/sieveeditorwidget.h
index 193ff63..dd1170d 100644
--- a/src/ksieveui/editor/sieveeditorwidget.h
+++ b/src/ksieveui/editor/sieveeditorwidget.h
@@ -107,13 +107,6 @@ public Q_SLOTS:
void uncomment();
void wordWrap(bool state);
-private Q_SLOTS:
- void slotEnableButtonOk(bool b);
- void slotGenerateXml();
- void slotSwitchMode();
- void slotSwitchTextMode(const QString &script);
- void slotSwitchToGraphicalMode();
- void slotModified();
Q_SIGNALS:
void checkSyntax();
void enableButtonOk(bool b);
@@ -125,6 +118,12 @@ Q_SIGNALS:
void changeModeEditor(bool);
void sieveEditorTabCurrentChanged();
private:
+ void slotEnableButtonOk(bool b);
+ void slotGenerateXml();
+ void slotSwitchMode();
+ void slotSwitchTextMode(const QString &script);
+ void slotSwitchToGraphicalMode();
+ void slotModified();
void changeSwitchButtonText();
void changeMode(EditorMode mode);
void addMessageEntry(const QString &errorMsg, const QColor &color);
diff --git a/src/ksieveui/editor/sievetextedit.h b/src/ksieveui/editor/sievetextedit.h
index f0f5154..85121b1 100644
--- a/src/ksieveui/editor/sievetextedit.h
+++ b/src/ksieveui/editor/sievetextedit.h
@@ -58,11 +58,6 @@ public:
void reverseCase();
void wordWrap(bool state);
bool isWordWrap() const;
-private Q_SLOTS:
- void slotUpdateLineNumberAreaWidth(int newBlockCount);
- void slotUpdateLineNumberArea(const QRect &, int);
- void slotHelp();
-
protected:
void initCompleter();
void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
@@ -78,6 +73,9 @@ Q_SIGNALS:
void openHelp(const QUrl &url);
private:
+ void slotUpdateLineNumberAreaWidth(int newBlockCount);
+ void slotUpdateLineNumberArea(const QRect &, int);
+ void slotHelp();
bool openVariableHelp();
bool overrideShortcut(QKeyEvent *event);
QStringList completerList() const;