summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-28 21:20:57 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-28 21:20:57 (GMT)
commit568ce484a01183d49527b04801a02b1f54180c37 (patch)
treed147bd89e393b114c4e31f3f53c6440b725c9a09
parent0dc10b648f8bc6baae3bae20857c84f3904b2d4a (diff)
Port to new connect api
-rw-r--r--src/composer-ng/richtextcomposer.h3
-rw-r--r--src/texteditor/richtexteditor/richtexteditor.cpp4
-rw-r--r--src/texteditor/richtexteditor/richtexteditorwidget.h3
-rw-r--r--src/texteditorcompleter.h4
-rw-r--r--src/texttospeech/texttospeech.h4
-rw-r--r--src/texttospeech/texttospeechactions.h6
-rw-r--r--src/texttospeech/texttospeechconfigwidget.cpp2
-rw-r--r--src/texttospeech/texttospeechconfigwidget.h9
-rw-r--r--src/texttospeech/texttospeechinterface.h4
-rw-r--r--src/texttospeech/texttospeechwidget.h4
10 files changed, 15 insertions, 28 deletions
diff --git a/src/composer-ng/richtextcomposer.h b/src/composer-ng/richtextcomposer.h
index a24b72b..00b38bf 100644
--- a/src/composer-ng/richtextcomposer.h
+++ b/src/composer-ng/richtextcomposer.h
@@ -138,10 +138,9 @@ protected:
void clearDecorator() Q_DECL_OVERRIDE;
void updateHighLighter() Q_DECL_OVERRIDE;
bool processKeyEvent(QKeyEvent *e);
-private Q_SLOTS:
- void slotTextModeChanged(KPIMTextEdit::RichTextComposer::Mode mode);
private:
+ void slotTextModeChanged(KPIMTextEdit::RichTextComposer::Mode mode);
void evaluateListSupport(QKeyEvent *event);
void evaluateReturnKeySupport(QKeyEvent *event);
class RichTextComposerPrivate;
diff --git a/src/texteditor/richtexteditor/richtexteditor.cpp b/src/texteditor/richtexteditor/richtexteditor.cpp
index 0dfe25d..13ee96a 100644
--- a/src/texteditor/richtexteditor/richtexteditor.cpp
+++ b/src/texteditor/richtexteditor/richtexteditor.cpp
@@ -190,12 +190,12 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos)
d->speller = new Sonnet::Speller();
}
if (!d->speller->availableBackends().isEmpty()) {
- QAction *spellCheckAction = popup->addAction(QIcon::fromTheme(QStringLiteral("tools-check-spelling")), i18n("Check Spelling..."), this, SLOT(slotCheckSpelling()));
+ QAction *spellCheckAction = popup->addAction(QIcon::fromTheme(QStringLiteral("tools-check-spelling")), i18n("Check Spelling..."), this, &RichTextEditor::slotCheckSpelling);
if (emptyDocument) {
spellCheckAction->setEnabled(false);
}
popup->addSeparator();
- QAction *autoSpellCheckAction = popup->addAction(i18n("Auto Spell Check"), this, SLOT(slotToggleAutoSpellCheck()));
+ QAction *autoSpellCheckAction = popup->addAction(i18n("Auto Spell Check"), this, &RichTextEditor::slotToggleAutoSpellCheck);
autoSpellCheckAction->setCheckable(true);
autoSpellCheckAction->setChecked(checkSpellingEnabled());
popup->addAction(autoSpellCheckAction);
diff --git a/src/texteditor/richtexteditor/richtexteditorwidget.h b/src/texteditor/richtexteditor/richtexteditorwidget.h
index f7e7e26..dec1ac0 100644
--- a/src/texteditor/richtexteditor/richtexteditorwidget.h
+++ b/src/texteditor/richtexteditor/richtexteditorwidget.h
@@ -56,12 +56,11 @@ public:
public Q_SLOTS:
void slotFindNext();
-private Q_SLOTS:
+private:
void slotFind();
void slotReplace();
void slotHideFindBar();
-private:
void init(RichTextEditor *customEditor = Q_NULLPTR);
RichTextEditorWidgetPrivate *const d;
};
diff --git a/src/texteditorcompleter.h b/src/texteditorcompleter.h
index 4cb6313..4ac3987 100644
--- a/src/texteditorcompleter.h
+++ b/src/texteditorcompleter.h
@@ -44,10 +44,8 @@ public:
void completeText();
void setExcludeOfCharacters(const QString &excludes);
-private Q_SLOTS:
- void slotCompletion(const QString &text);
-
private:
+ void slotCompletion(const QString &text);
class TextEditorCompleterPrivate;
TextEditorCompleterPrivate *const d;
};
diff --git a/src/texttospeech/texttospeech.h b/src/texttospeech/texttospeech.h
index 7f663eb..ba45850 100644
--- a/src/texttospeech/texttospeech.h
+++ b/src/texttospeech/texttospeech.h
@@ -68,10 +68,8 @@ public Q_SLOTS:
Q_SIGNALS:
void stateChanged(TextToSpeech::State);
-private Q_SLOTS:
- void slotStateChanged();
-
private:
+ void slotStateChanged();
explicit TextToSpeech(QObject *parent = Q_NULLPTR);
friend class TextToSpeechPrivate;
diff --git a/src/texttospeech/texttospeechactions.h b/src/texttospeech/texttospeechactions.h
index c487672..988da84 100644
--- a/src/texttospeech/texttospeechactions.h
+++ b/src/texttospeech/texttospeechactions.h
@@ -44,11 +44,9 @@ public Q_SLOTS:
Q_SIGNALS:
void stateChanged(KPIMTextEdit::TextToSpeechWidget::State state);
-private Q_SLOTS:
- void slotStop();
- void slotPlayPause();
-
private:
+ void slotPlayPause();
+ void slotStop();
TextToSpeechActionsPrivate *const d;
};
}
diff --git a/src/texttospeech/texttospeechconfigwidget.cpp b/src/texttospeech/texttospeechconfigwidget.cpp
index 786adcf..71ef451 100644
--- a/src/texttospeech/texttospeechconfigwidget.cpp
+++ b/src/texttospeech/texttospeechconfigwidget.cpp
@@ -74,7 +74,7 @@ TextToSpeechConfigWidget::TextToSpeechConfigWidget(QWidget *parent)
layout->addRow(i18n("Voice:"), mVoice);
connect(mVoice, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &TextToSpeechConfigWidget::valueChanged);
- QTimer::singleShot(0, this, SLOT(slotUpdateSettings()));
+ QTimer::singleShot(0, this, &TextToSpeechConfigWidget::slotUpdateSettings);
}
TextToSpeechConfigWidget::~TextToSpeechConfigWidget()
diff --git a/src/texttospeech/texttospeechconfigwidget.h b/src/texttospeech/texttospeechconfigwidget.h
index c7ab5a5..7a2df81 100644
--- a/src/texttospeech/texttospeechconfigwidget.h
+++ b/src/texttospeech/texttospeechconfigwidget.h
@@ -37,16 +37,15 @@ public:
void setTextToSpeechConfigInterface(AbstractTextToSpeechConfigInterface *interface);
-private Q_SLOTS:
- void valueChanged();
- void slotUpdateSettings();
- void slotEngineChanged();
- void slotLanguageChanged();
Q_SIGNALS:
void configChanged(bool state);
private:
+ void valueChanged();
+ void slotUpdateSettings();
+ void slotEngineChanged();
+ void slotLanguageChanged();
void updateVoice();
void updateLocale();
void updateEngine();
diff --git a/src/texttospeech/texttospeechinterface.h b/src/texttospeech/texttospeechinterface.h
index 7cbf630..88ad81e 100644
--- a/src/texttospeech/texttospeechinterface.h
+++ b/src/texttospeech/texttospeechinterface.h
@@ -39,10 +39,8 @@ public:
void setVolume(int value) Q_DECL_OVERRIDE;
void reloadSettings() Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void stateChanged(KPIMTextEdit::TextToSpeechWidget::State state);
-
private:
+ void stateChanged(KPIMTextEdit::TextToSpeechWidget::State state);
TextToSpeechInterfacePrivate *const d;
};
}
diff --git a/src/texttospeech/texttospeechwidget.h b/src/texttospeech/texttospeechwidget.h
index 48d7df8..8bb5bc1 100644
--- a/src/texttospeech/texttospeechwidget.h
+++ b/src/texttospeech/texttospeechwidget.h
@@ -55,11 +55,9 @@ public Q_SLOTS:
Q_SIGNALS:
void stateChanged(KPIMTextEdit::TextToSpeechWidget::State state);
-private Q_SLOTS:
+private:
void slotVolumeChanged(int value);
void slotConfigure();
-
-private:
TextToSpeechWidgetPrivate *const d;
};
}