Commit c7c9b68d authored by Laurent Montel's avatar Laurent Montel 😁

Port to new connect api. Clean up

parent f0958142
......@@ -750,8 +750,8 @@ void AttachmentControllerBase::editAttachment(AttachmentPart::Ptr part, MessageV
QUrl::fromLocalFile(tempFile->fileName()),
QString::fromLatin1(part->mimeType()), openWithOption,
this, d->wParent);
connect(watcher, SIGNAL(editDone(MessageViewer::EditorWatcher*)),
this, SLOT(editDone(MessageViewer::EditorWatcher*)));
connect(watcher, &MessageViewer::EditorWatcher::editDone,
this, [this](MessageViewer::EditorWatcher *watcher) { d->editDone(watcher);});
switch (watcher->start()) {
case MessageViewer::EditorWatcher::NoError:
......
......@@ -98,8 +98,6 @@ protected:
private:
void attachFiles(const QList<QUrl> &urls, const QString &encoding);
void attachDirectory(const QUrl &url);
private Q_SLOTS:
void slotPutResult(KJob *job);
void slotOpenWithDialog();
void slotOpenWithAction(QAction *act);
......@@ -107,8 +105,6 @@ private Q_SLOTS:
private:
class Private;
Private *const d;
Q_PRIVATE_SLOT(d, void editDone(MessageViewer::EditorWatcher *))
};
} //
......
......@@ -38,7 +38,6 @@ Q_SIGNALS:
void focusDown();
protected:
void keyPressEvent(QKeyEvent *) override;
};
}
......
......@@ -110,18 +110,9 @@ ComposerViewBase::ComposerViewBase(QObject *parent, QWidget *parentGui)
, m_dictionary(nullptr)
, m_fccCombo(nullptr)
, m_parentWidget(parentGui)
, m_sign(false)
, m_encrypt(false)
, m_neverEncrypt(false)
, m_mdnRequested(false)
, m_urgent(false)
, m_cryptoMessageFormat(Kleo::AutoFormat)
, m_pendingQueueJobs(0)
, m_autoSaveTimer(nullptr)
, m_autoSaveErrorShown(false)
, m_autoSaveInterval(1 * 1000 * 60)
, // default of 1 min
mSendLaterInfo(nullptr)
, m_autoSaveInterval(1 * 1000 * 60) // default of 1 min
, mSendLaterInfo(nullptr)
{
m_charsets << "utf-8"; // default, so we have a backup in case client code forgot to set.
......
......@@ -341,18 +341,22 @@ private:
// Used mainly to prevent closing the window if a composer is active
QList< MessageComposer::Composer * > m_composers;
bool m_sign, m_encrypt, m_neverEncrypt, m_mdnRequested, m_urgent;
bool m_sign = false;
bool m_encrypt = false;
bool m_neverEncrypt = false;
bool m_mdnRequested = false;
bool m_urgent = false;
Kleo::CryptoMessageFormat m_cryptoMessageFormat;
QString mExpandedFrom, m_from, m_replyTo, m_subject;
QStringList mExpandedTo, mExpandedCc, mExpandedBcc;
QList< QByteArray > m_charsets;
QMap<QByteArray, QString> m_customHeader;
int m_pendingQueueJobs;
int m_pendingQueueJobs = 0;
QTimer *m_autoSaveTimer = nullptr;
QString m_autoSaveUUID;
bool m_autoSaveErrorShown; // Stops an error message being shown every time autosave is executed.
bool m_autoSaveErrorShown = false; // Stops an error message being shown every time autosave is executed.
int m_autoSaveInterval;
MessageComposer::MessageSender::SendMethod mSendMethod;
......
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