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 94832b19 authored by Laurent Montel's avatar Laurent Montel 😁

initialize value

parent 6744dcd7
......@@ -108,35 +108,35 @@ public:
void updateJobResult(KJob *);
AttachmentControllerBase *const q;
bool encryptEnabled;
bool signEnabled;
MessageComposer::AttachmentModel *model;
QWidget *wParent;
bool encryptEnabled = false;
bool signEnabled = false;
MessageComposer::AttachmentModel *model = nullptr;
QWidget *wParent = nullptr;
QHash<MessageViewer::EditorWatcher *, AttachmentPart::Ptr> editorPart;
QHash<MessageViewer::EditorWatcher *, QTemporaryFile *> editorTempFile;
AttachmentPart::List selectedParts;
KActionCollection *mActionCollection;
QAction *attachPublicKeyAction;
QAction *attachMyPublicKeyAction;
QAction *openContextAction;
QAction *viewContextAction;
QAction *editContextAction;
QAction *editWithContextAction;
QAction *removeAction;
QAction *removeContextAction;
QAction *saveAsAction;
QAction *saveAsContextAction;
QAction *propertiesAction;
QAction *propertiesContextAction;
QAction *addAttachmentFileAction;
QAction *addAttachmentDirectoryAction;
QAction *addContextAction;
QAction *selectAllAction;
KActionMenu *attachmentMenu;
QAction *addOwnVcardAction;
QAction *reloadAttachmentAction;
QAction *attachVCardsAction;
KActionCollection *mActionCollection = nullptr;
QAction *attachPublicKeyAction = nullptr;
QAction *attachMyPublicKeyAction = nullptr;
QAction *openContextAction = nullptr;
QAction *viewContextAction = nullptr;
QAction *editContextAction = nullptr;
QAction *editWithContextAction = nullptr;
QAction *removeAction = nullptr;
QAction *removeContextAction = nullptr;
QAction *saveAsAction = nullptr;
QAction *saveAsContextAction = nullptr;
QAction *propertiesAction = nullptr;
QAction *propertiesContextAction = nullptr;
QAction *addAttachmentFileAction = nullptr;
QAction *addAttachmentDirectoryAction = nullptr;
QAction *addContextAction = nullptr;
QAction *selectAllAction = nullptr;
KActionMenu *attachmentMenu = nullptr;
QAction *addOwnVcardAction = nullptr;
QAction *reloadAttachmentAction = nullptr;
QAction *attachVCardsAction = nullptr;
// If part p is compressed, uncompressedParts[p] is the uncompressed part.
QHash<AttachmentPart::Ptr, AttachmentPart::Ptr> uncompressedParts;
......@@ -144,31 +144,6 @@ public:
AttachmentControllerBase::Private::Private(AttachmentControllerBase *qq)
: q(qq)
, encryptEnabled(false)
, signEnabled(false)
, model(nullptr)
, wParent(nullptr)
, mActionCollection(nullptr)
, attachPublicKeyAction(nullptr)
, attachMyPublicKeyAction(nullptr)
, openContextAction(nullptr)
, viewContextAction(nullptr)
, editContextAction(nullptr)
, editWithContextAction(nullptr)
, removeAction(nullptr)
, removeContextAction(nullptr)
, saveAsAction(nullptr)
, saveAsContextAction(nullptr)
, propertiesAction(nullptr)
, propertiesContextAction(nullptr)
, addAttachmentFileAction(nullptr)
, addAttachmentDirectoryAction(nullptr)
, addContextAction(nullptr)
, selectAllAction(nullptr)
, attachmentMenu(nullptr)
, addOwnVcardAction(nullptr)
, reloadAttachmentAction(nullptr)
, attachVCardsAction(nullptr)
{
}
......
......@@ -53,23 +53,17 @@ public:
AttachmentModel *const q;
AttachmentPart::List parts;
bool modified;
bool encryptEnabled;
bool signEnabled;
bool encryptSelected;
bool signSelected;
bool autoDisplayEnabled;
bool modified = false;
bool encryptEnabled = false;
bool signEnabled = false;
bool encryptSelected = false;
bool signSelected = false;
bool autoDisplayEnabled = false;
QList<QTemporaryDir *> tempDirs;
};
AttachmentModel::Private::Private(AttachmentModel *qq)
: q(qq)
, modified(false)
, encryptEnabled(false)
, signEnabled(false)
, encryptSelected(false)
, signSelected(false)
, autoDisplayEnabled(false)
{
}
......
......@@ -44,8 +44,8 @@ public:
void fixHtmlFontSize(QString &cleanHtml);
QString toCleanHtml() const;
PimCommon::AutoCorrection *autoCorrection;
RichTextComposerNg *richtextComposer;
PimCommon::AutoCorrection *autoCorrection = nullptr;
RichTextComposerNg *richtextComposer = nullptr;
MessageComposer::RichTextComposerSignatures *richTextComposerSignatures;
};
......
......@@ -322,18 +322,18 @@ private:
void addFollowupReminder(const QString &messageId);
KMime::Message::Ptr m_msg;
MessageComposer::AttachmentControllerBase *m_attachmentController;
MessageComposer::AttachmentModel *m_attachmentModel;
MessageComposer::SignatureController *m_signatureController;
MessageComposer::RecipientsEditor *m_recipientsEditor;
KIdentityManagement::IdentityCombo *m_identityCombo;
KIdentityManagement::IdentityManager *m_identMan;
MessageComposer::RichTextComposerNg *m_editor;
MailTransport::TransportComboBox *m_transport;
Sonnet::DictionaryComboBox *m_dictionary;
Akonadi::CollectionComboBox *m_fccCombo;
MessageComposer::AttachmentControllerBase *m_attachmentController = nullptr;
MessageComposer::AttachmentModel *m_attachmentModel = nullptr;
MessageComposer::SignatureController *m_signatureController = nullptr;
MessageComposer::RecipientsEditor *m_recipientsEditor = nullptr;
KIdentityManagement::IdentityCombo *m_identityCombo = nullptr;
KIdentityManagement::IdentityManager *m_identMan = nullptr;
MessageComposer::RichTextComposerNg *m_editor = nullptr;
MailTransport::TransportComboBox *m_transport = nullptr;
Sonnet::DictionaryComboBox *m_dictionary = nullptr;
Akonadi::CollectionComboBox *m_fccCombo = nullptr;
Akonadi::Collection m_fccCollection;
QWidget *m_parentWidget;
QWidget *m_parentWidget = nullptr;
// List of active composer jobs. For example, saving as draft, autosaving and printing
// all create a composer, which is added to this list as long as it is active.
......@@ -349,7 +349,7 @@ private:
int m_pendingQueueJobs;
QTimer *m_autoSaveTimer;
QTimer *m_autoSaveTimer = nullptr;
QString m_autoSaveUUID;
bool m_autoSaveErrorShown; // Stops an error message being shown every time autosave is executed.
int m_autoSaveInterval;
......@@ -360,7 +360,7 @@ private:
QDate mFollowUpDate;
Akonadi::Collection mFollowUpCollection;
SendLater::SendLaterInfo *mSendLaterInfo;
SendLater::SendLaterInfo *mSendLaterInfo = nullptr;
};
} // namespace
......
......@@ -294,17 +294,17 @@ private:
bool mEncryptToSelf;
const bool mShowApprovalDialog : 1;
const bool mOpportunisticEncyption : 1;
const unsigned int mCryptoMessageFormats;
const int mEncryptKeyNearExpiryWarningThreshold;
const int mSigningKeyNearExpiryWarningThreshold;
const int mEncryptRootCertNearExpiryWarningThreshold;
const int mSigningRootCertNearExpiryWarningThreshold;
const int mEncryptChainCertNearExpiryWarningThreshold;
const int mSigningChainCertNearExpiryWarningThreshold;
};
const bool mOpportunisticEncyption : 1;
const unsigned int mCryptoMessageFormats;
const int mEncryptKeyNearExpiryWarningThreshold;
const int mSigningKeyNearExpiryWarningThreshold;
const int mEncryptRootCertNearExpiryWarningThreshold;
const int mSigningRootCertNearExpiryWarningThreshold;
const int mEncryptChainCertNearExpiryWarningThreshold;
const int mSigningChainCertNearExpiryWarningThreshold;
};
} // namespace Kleo
} // namespace Kleo
#endif // __KLEO_KEYRESOLVER_H__
......@@ -37,15 +37,12 @@ class MessageComposer::SignatureControllerPrivate
{
public:
SignatureControllerPrivate()
: m_editor(nullptr),
m_identityCombo(nullptr),
m_currentIdentityId(0)
{
}
MessageComposer::RichTextComposerNg *m_editor;
KIdentityManagement::IdentityCombo *m_identityCombo;
uint m_currentIdentityId;
MessageComposer::RichTextComposerNg *m_editor = nullptr;
KIdentityManagement::IdentityCombo *m_identityCombo = nullptr;
uint m_currentIdentityId = 0;
};
SignatureController::SignatureController(QObject *parent) :
......
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