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

GIT_SILENT: When depending against qt5.7 we can use override directly

parent a099f444
......@@ -37,7 +37,7 @@ public:
{
}
KPIM::MultiplyingLine *newLine(QWidget *parent) Q_DECL_OVERRIDE {
KPIM::MultiplyingLine *newLine(QWidget *parent) override {
auto line = qobject_cast<MessageComposer::RecipientLineNG *>(
MessageComposer::RecipientLineFactory::newLine(parent));
line->setEnableAkonadiSearch(false);
......
......@@ -57,10 +57,10 @@ public:
{
}
MimeTreeParser::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE {
MimeTreeParser::HtmlWriter *htmlWriter() override {
return mWriter;
}
MessageViewer::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE {
MessageViewer::CSSHelperBase *cssHelper() override {
return mCSSHelper;
}
......
......@@ -31,14 +31,14 @@ public:
explicit TestHtmlWriter() {}
virtual ~TestHtmlWriter() {}
void begin(const QString &) Q_DECL_OVERRIDE {}
void write(const QString &) Q_DECL_OVERRIDE {}
void end() Q_DECL_OVERRIDE {}
void reset() Q_DECL_OVERRIDE {}
void queue(const QString &) Q_DECL_OVERRIDE {}
void flush() Q_DECL_OVERRIDE {}
void embedPart(const QByteArray &, const QString &) Q_DECL_OVERRIDE {}
void extraHead(const QString &) Q_DECL_OVERRIDE {}
void begin(const QString &) override {}
void write(const QString &) override {}
void end() override {}
void reset() override {}
void queue(const QString &) override {}
void flush() override {}
void embedPart(const QByteArray &, const QString &) override {}
void extraHead(const QString &) override {}
};
......
......@@ -78,10 +78,10 @@ public:
~AttachmentModel();
bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
QStringList mimeTypes() const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
int row, int column, const QModelIndex &parent) override;
QMimeData *mimeData(const QModelIndexList &indexes) const override;
QStringList mimeTypes() const override;
Qt::DropActions supportedDropActions() const override;
/// for the save/discard warning
bool isModified() const;
......@@ -101,8 +101,8 @@ public:
bool isAutoDisplayEnabled() const;
void setAutoDisplayEnabled(bool enabled);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
bool addAttachment(MessageCore::AttachmentPart::Ptr part);
bool updateAttachment(MessageCore::AttachmentPart::Ptr part);
......@@ -110,14 +110,14 @@ public:
bool removeAttachment(MessageCore::AttachmentPart::Ptr part);
MessageCore::AttachmentPart::List attachments() const;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
int role = Qt::DisplayRole) const override;
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &index) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
Q_SIGNALS:
void encryptEnabled(bool enabled);
......
......@@ -51,9 +51,9 @@ public:
void insertSignature(const KIdentityManagement::Signature &signature, KIdentityManagement::Signature::Placement placement, KIdentityManagement::Signature::AddedText addedText);
QString toCleanHtml() const;
void forceAutoCorrection(bool selectedText = false) Q_DECL_OVERRIDE;
void forceAutoCorrection(bool selectedText = false) override;
private:
bool processAutoCorrection(QKeyEvent *event) Q_DECL_OVERRIDE;
bool processAutoCorrection(QKeyEvent *event) override;
RichTextComposerNgPrivate *const d;
};
}
......
......@@ -78,10 +78,10 @@ public:
bool finished() const;
public Q_SLOTS:
void start() Q_DECL_OVERRIDE;
void start() override;
protected Q_SLOTS:
void slotResult(KJob *job) Q_DECL_OVERRIDE;
void slotResult(KJob *job) override;
private:
Q_DECLARE_PRIVATE(Composer)
......
......@@ -40,7 +40,7 @@ Q_SIGNALS:
protected:
void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *) override;
};
}
......
......@@ -49,7 +49,7 @@ public:
void setCollectionToDo(const Akonadi::Collection &collection);
void start() Q_DECL_OVERRIDE;
void start() override;
private Q_SLOTS:
void slotCreateNewTodo(KJob *job);
......
......@@ -38,7 +38,7 @@ public:
QDate selectedDate() const;
void accept() Q_DECL_OVERRIDE;
void accept() override;
Akonadi::Collection collection() const;
private Q_SLOTS:
......
......@@ -61,7 +61,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the expanded email addresses.
......
......@@ -43,7 +43,7 @@ public:
void setFingerprint(const QString &fingerprint);
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void doStart() override;
private:
class Private;
......
......@@ -44,8 +44,8 @@ public:
void setAttachmentPart(MessageCore::AttachmentPart::Ptr part);
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void process() Q_DECL_OVERRIDE;
void doStart() override;
void process() override;
private:
Q_DECLARE_PRIVATE(AttachmentJob)
......
......@@ -32,7 +32,7 @@ public:
~AttachmentVcardFromAddressBookJob();
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void doStart() override;
private Q_SLOTS:
void slotExpandGroupResult(KJob *job);
......
......@@ -49,7 +49,7 @@ public:
Emits finished() after all processing is done, and the
content is reachable through content().
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
Get the resulting KMime::Content that the ContentJobBase has generated.
......@@ -80,7 +80,7 @@ protected:
ContentJobBase(ContentJobBasePrivate &dd, QObject *parent);
/** Use appendSubjob() instead. */
bool addSubjob(KJob *job) Q_DECL_OVERRIDE;
bool addSubjob(KJob *job) override;
protected Q_SLOTS:
/**
......@@ -97,7 +97,7 @@ protected Q_SLOTS:
*/
virtual void process() = 0;
void slotResult(KJob *job) Q_DECL_OVERRIDE;
void slotResult(KJob *job) override;
private:
Q_DECLARE_PRIVATE(ContentJobBase)
......
......@@ -51,7 +51,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the email addresses of the list members.
......
......@@ -59,7 +59,7 @@ public:
/**
* Starts the job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Sets the from address to expand.
......
......@@ -56,14 +56,14 @@ public:
void setContent(KMime::Content *content);
void setCryptoMessageFormat(Kleo::CryptoMessageFormat format);
void setEncryptionKeys(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
void setRecipients(const QStringList &rec) Q_DECL_OVERRIDE;
void setEncryptionKeys(const std::vector<GpgME::Key> &keys) override;
void setRecipients(const QStringList &rec) override;
std::vector<GpgME::Key> encryptionKeys() const Q_DECL_OVERRIDE;
QStringList recipients() const Q_DECL_OVERRIDE;
std::vector<GpgME::Key> encryptionKeys() const override;
QStringList recipients() const override;
protected Q_SLOTS:
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(EncryptJob)
......
......@@ -51,7 +51,7 @@ public:
void setEncoding(const QString &encoding);
void start() Q_DECL_OVERRIDE;
void start() override;
private Q_SLOTS:
......
......@@ -41,8 +41,8 @@ public:
void setTextPart(TextPart *part);
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void process() Q_DECL_OVERRIDE;
void doStart() override;
void process() override;
private:
Q_DECLARE_PRIVATE(MainTextJob)
......
......@@ -42,7 +42,7 @@ public:
void setMultipartSubtype(const QByteArray &subtype);
protected Q_SLOTS:
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(MultipartJob)
......
......@@ -58,16 +58,16 @@ public:
void setCryptoMessageFormat(Kleo::CryptoMessageFormat format);
void setSigningKeys(std::vector<GpgME::Key> &signers);
void setEncryptionKeys(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
void setRecipients(const QStringList &rec) Q_DECL_OVERRIDE;
void setEncryptionKeys(const std::vector<GpgME::Key> &keys) override;
void setRecipients(const QStringList &rec) override;
std::vector<GpgME::Key> encryptionKeys() const Q_DECL_OVERRIDE;
QStringList recipients() const Q_DECL_OVERRIDE;
std::vector<GpgME::Key> encryptionKeys() const override;
QStringList recipients() const override;
KMime::Content *origContent();
protected Q_SLOTS:
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(SignEncryptJob)
......
......@@ -59,7 +59,7 @@ public:
KMime::Content *origContent();
protected Q_SLOTS:
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(SignJob)
......
......@@ -61,7 +61,7 @@ public:
KMime::Headers::ContentType *contentType();
protected Q_SLOTS:
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(SinglepartJob)
......
......@@ -54,7 +54,7 @@ public:
KMime::Message *message() const;
void start() Q_DECL_OVERRIDE;
void start() override;
private:
Q_DECLARE_PRIVATE(SkeletonMessageJob)
......
......@@ -42,7 +42,7 @@ public:
virtual ~TransparentJob();
void setContent(KMime::Content *content);
void process() Q_DECL_OVERRIDE;
void process() override;
private:
Q_DECLARE_PRIVATE(TransparentJob)
......
......@@ -58,8 +58,8 @@ public:
void setName(const QString &name);
QString name() const;
bool isEmpty() const Q_DECL_OVERRIDE;
void clear() Q_DECL_OVERRIDE;
bool isEmpty() const override;
void clear() override;
static int typeToId(Type type);
static Type idToType(int id);
......
......@@ -43,7 +43,7 @@ Q_SIGNALS:
void rightPressed();
protected:
void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *ev) override;
};
class MESSAGECOMPOSER_EXPORT RecipientLineEdit : public MessageComposer::ComposerLineEdit
......@@ -58,7 +58,7 @@ Q_SIGNALS:
void rightPressed();
protected:
void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *ev) override;
};
class MESSAGECOMPOSER_EXPORT RecipientLineNG : public KPIM::MultiplyingLine
......@@ -68,25 +68,25 @@ public:
explicit RecipientLineNG(QWidget *parent);
virtual ~RecipientLineNG() {}
void activate() Q_DECL_OVERRIDE;
bool isActive() const Q_DECL_OVERRIDE;
void activate() override;
bool isActive() const override;
bool isEmpty() const Q_DECL_OVERRIDE;
void clear() Q_DECL_OVERRIDE;
bool canDeleteLineEdit() const Q_DECL_OVERRIDE;
bool isEmpty() const override;
void clear() override;
bool canDeleteLineEdit() const override;
bool isModified() const Q_DECL_OVERRIDE;
void clearModified() Q_DECL_OVERRIDE;
bool isModified() const override;
void clearModified() override;
KPIM::MultiplyingLineData::Ptr data() const Q_DECL_OVERRIDE;
void setData(const KPIM::MultiplyingLineData::Ptr &data) Q_DECL_OVERRIDE;
KPIM::MultiplyingLineData::Ptr data() const override;
void setData(const KPIM::MultiplyingLineData::Ptr &data) override;
void fixTabOrder(QWidget *previous) Q_DECL_OVERRIDE;
QWidget *tabOut() const Q_DECL_OVERRIDE;
void fixTabOrder(QWidget *previous) override;
QWidget *tabOut() const override;
void setCompletionMode(KCompletion::CompletionMode mode) Q_DECL_OVERRIDE;
void setCompletionMode(KCompletion::CompletionMode mode) override;
int setColumnWidth(int w) Q_DECL_OVERRIDE;
int setColumnWidth(int w) override;
// recipient specific methods
int recipientsCount() const;
......@@ -123,7 +123,7 @@ protected Q_SLOTS:
void analyzeLine(const QString &);
protected:
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *watched, QEvent *event) override;
private:
void dataFromFields();
......
......@@ -45,8 +45,8 @@ class MESSAGECOMPOSER_EXPORT RecipientLineFactory : public KPIM::MultiplyingLine
Q_OBJECT
public:
explicit RecipientLineFactory(QObject *parent);
KPIM::MultiplyingLine *newLine(QWidget *parent) Q_DECL_OVERRIDE;
int maximumRecipients() Q_DECL_OVERRIDE;
KPIM::MultiplyingLine *newLine(QWidget *parent) override;
int maximumRecipients() override;
};
class RecipientsPicker;
......@@ -97,8 +97,8 @@ protected Q_SLOTS:
void addRecipient(RecipientLineNG *, const QString &);
protected:
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
RecipientLineNG *activeLine() const Q_DECL_OVERRIDE;
bool eventFilter(QObject *object, QEvent *event) override;
RecipientLineNG *activeLine() const override;
private:
RecipientsEditorPrivate *const d;
......
......@@ -60,7 +60,7 @@ protected:
void pick(Recipient::Type);
void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *) override;
protected Q_SLOTS:
void slotToClicked();
......
......@@ -53,13 +53,13 @@ protected:
TODO cberzan: update docu...
*/
bool doSend(const KMime::Message::Ptr &msg, short sendNow) Q_DECL_OVERRIDE;
bool doSend(const KMime::Message::Ptr &msg, short sendNow) override;
/**
Send queued messages, using the specified transport or the
default, if none is given.
*/
bool doSendQueued(int transportId = -1) Q_DECL_OVERRIDE;
bool doSendQueued(int transportId = -1) override;
private:
/**
......
......@@ -55,7 +55,7 @@ public:
/**
* Starts the attachment compress job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Sets the original @p part of the compressed attachment.
......
......@@ -59,7 +59,7 @@ public:
KZip::Compression compression() const;
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void doStart() override;
private:
//@cond PRIVATE
......
......@@ -66,7 +66,7 @@ public:
const KMime::Content *mimeContent() const;
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void doStart() override;
private:
//@cond PRIVATE
......
......@@ -57,7 +57,7 @@ public:
void setMaximumAllowedSize(qint64 size);
protected Q_SLOTS:
virtual void doStart() Q_DECL_OVERRIDE = 0;
virtual void doStart() override = 0;
private:
//@cond PRIVATE
......
......@@ -51,7 +51,7 @@ public:
~AttachmentFromUrlJob();
protected Q_SLOTS:
void doStart() Q_DECL_OVERRIDE;
void doStart() override;
private:
//@cond PRIVATE
......
......@@ -54,7 +54,7 @@ public:
/**
* Starts the attachment load job.
*/
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Returns the loaded attachment.
......
......@@ -94,7 +94,7 @@ public:
bool isSignEnabled() const;
public Q_SLOTS:
void accept() Q_DECL_OVERRIDE;
void accept() override;