Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6f933a2d authored by Laurent Montel's avatar Laurent Montel 😁

Use new connect api

parent b142d4fd
......@@ -111,7 +111,7 @@ public:
QAction *action_paste_without_formatting = nullptr;
QAction *action_add_image = nullptr;
QAction *action_add_emoticon = nullptr;
KPIMTextEdit::EmoticonTextEditAction *action_add_emoticon = nullptr;
QAction *action_insert_html = nullptr;
KPIMTextEdit::TableActionMenu *action_add_table = nullptr;
QAction *action_delete_line = nullptr;
......@@ -448,7 +448,7 @@ void RichTextComposerActions::createActions(KActionCollection *ac)
if (ac) {
ac->addAction(QStringLiteral("add_emoticon"), d->action_add_emoticon);
}
connect(d->action_add_emoticon, SIGNAL(emoticonActivated(QString)), d->composerControler, SLOT(slotAddEmoticon(QString)));
connect(d->action_add_emoticon, &EmoticonTextEditAction::emoticonActivated, d->composerControler, &RichTextComposerControler::slotAddEmoticon);
d->richTextActionList.append(d->action_add_emoticon);
d->action_insert_html = new QAction(i18n("Insert HTML"), this);
......
......@@ -19,6 +19,7 @@
#include "richtextcomposer.h"
#include "richtextexternalcomposer.h"
#include "richtextexternalcomposer.h"
#include <KProcess>
#include <KMacroExpander>
......@@ -123,8 +124,7 @@ void RichTextExternalComposer::startExternalEditor()
(*d->externalEditorProcess) << d->extEditorTempFile->fileName();
}
connect(d->externalEditorProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SLOT(slotEditorFinished(int,QProcess::ExitStatus)));
connect(d->externalEditorProcess, QOverload<int,QProcess::ExitStatus>::of(&KProcess::finished), this, &RichTextExternalComposer::slotEditorFinished);
d->externalEditorProcess->start();
if (!d->externalEditorProcess->waitForStarted()) {
d->cannotStartProcess(commandLine);
......
......@@ -45,14 +45,12 @@ public:
bool isInProgress() const;
private Q_SLOTS:
void slotEditorFinished(int codeError, QProcess::ExitStatus exitStatus);
Q_SIGNALS:
void externalEditorClosed();
void externalEditorStarted();
private:
void slotEditorFinished(int codeError, QProcess::ExitStatus exitStatus);
class RichTextExternalComposerPrivate;
RichTextExternalComposerPrivate *const d;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment