Commit 88ee9ad3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix build with GCC 12 (more standard attributes in middle of decl-specifiers)

parent 4e5e0d8a
Pipeline #125111 passed with stage
in 3 minutes and 54 seconds
......@@ -101,12 +101,10 @@ protected:
void convertCollectionListStrToAkonadiId(const KSharedConfig::Ptr &config, const QString &groupName, const QString &key, bool addCollectionPrefix);
void convertRealPathToCollectionList(KConfigGroup &group, const QString &currentKey, bool addCollectionPrefix = true);
virtual Q_REQUIRED_RESULT Akonadi::Collection::Id convertFolderPathToCollectionId(const QString &path) = 0;
Q_REQUIRED_RESULT virtual Akonadi::Collection::Id convertFolderPathToCollectionId(const QString &path) = 0;
virtual QString adaptNewResourceUrl(bool overwriteResources, const KSharedConfig::Ptr &resourceConfig, const QString &storePath) = 0;
virtual Q_REQUIRED_RESULT QString createResource(const QString &resources,
const QString &name,
const QMap<QString, QVariant> &settings,
bool synchronizeTree = false) = 0;
Q_REQUIRED_RESULT virtual QString
createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings, bool synchronizeTree = false) = 0;
QHash<QString, Akonadi::Collection::Id> mHashConvertPathCollectionId;
QVector<ResourceFiles> mListResourceFile;
......
......@@ -26,8 +26,8 @@ protected:
virtual void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey) = 0;
void slotCheckBackupConfig();
virtual void exportResourceToArchive(const QString &archivePath, const QString &url, const QString &identifier) = 0;
virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &agentIdentifier, const QString &defaultPath) const = 0;
Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &agentIdentifier, const QString &defaultPath) const = 0;
virtual void backupAddressBookResourceFile(const QString &agentIdentifier, const QString &defaultPath) = 0;
private:
......
......@@ -23,8 +23,8 @@ public:
protected:
void slotNextStep() override;
virtual void synchronizeResource(const QStringList &lst) = 0;
virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
virtual Q_REQUIRED_RESULT QString configLocation() const;
Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
Q_REQUIRED_RESULT virtual QString configLocation() const;
void restoreResources();
private:
......
......@@ -24,8 +24,8 @@ public:
protected:
void slotCheckBackupConfig();
virtual void exportResourceToArchive(const QString &archivePath, const QString &url, const QString &identifier) = 0;
virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) const = 0;
virtual void backupAlarmResourceFile(const QString &agentIdentifier, const QString &defaultPath) = 0;
virtual void convertCollectionIdsToRealPath(KConfigGroup &selectFolderNoteGroup, const QString &selectFolderNoteGroupStr) = 0;
......
......@@ -22,10 +22,10 @@ public:
protected:
void slotNextStep() override;
virtual void synchronizeResource(const QStringList &lst) = 0;
virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
void restoreResources();
virtual Q_REQUIRED_RESULT QString configLocation() const;
Q_REQUIRED_RESULT virtual QString configLocation() const;
private:
Q_REQUIRED_RESULT bool isAConfigFile(const QString &name) const override;
......
......@@ -30,7 +30,7 @@ public:
Q_REQUIRED_RESULT QString defaultPath() const;
void setDefaultPath(const QString &defaultPath);
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) const = 0;
Q_SIGNALS:
void error(const QString &);
void info(const QString &);
......
......@@ -23,11 +23,11 @@ public:
protected:
void slotCheckBackupConfig();
virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
virtual void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey) = 0;
virtual void exportResourceToArchive(const QString &archivePath, const QString &url, const QString &identifier) = 0;
virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) const = 0;
virtual void backupCalendarResourceFile(const QString &agentIdentifier, const QString &defaultPath) = 0;
private:
......
......@@ -23,9 +23,9 @@ public:
protected:
void slotNextStep() override;
virtual void synchronizeResource(const QStringList &lst) = 0;
virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
virtual Q_REQUIRED_RESULT QString configLocation() const;
Q_REQUIRED_RESULT virtual QString configLocation() const;
private:
Q_REQUIRED_RESULT bool isAConfigFile(const QString &name) const override;
......
......@@ -36,15 +36,15 @@ protected:
virtual void convertCollectionListToRealPath(KConfigGroup &group, const QString &currentKey) = 0;
void backupResources();
virtual QVector<MailCommon::MailFilter *> filters() = 0;
virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
void slotCheckBackupResources();
virtual void exportResourceToArchive(const QString &archivePath, const QString &url, const QString &identifier) = 0;
virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
virtual Q_REQUIRED_RESULT QString storeResources(KZip *archive, const QString &identifier, const QString &path) = 0;
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
Q_REQUIRED_RESULT virtual QString storeResources(KZip *archive, const QString &identifier, const QString &path) = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) const = 0;
virtual void backupMailResourceFile(const QString &agentIdentifier, const QString &defaultPath) = 0;
virtual void exportFilters() = 0;
virtual Q_REQUIRED_RESULT QVector<uint> listIdentityUoid() const = 0;
Q_REQUIRED_RESULT virtual QVector<uint> listIdentityUoid() const = 0;
private:
void slotCheckBackupIdentity();
......
......@@ -46,8 +46,8 @@ protected:
virtual void registerSpecialCollection(Akonadi::SpecialMailCollections::Type type, qint64 colId) = 0;
virtual void synchronizeResource(const QStringList &lst) = 0;
virtual void importFilters(const QString &filename) = 0;
virtual Q_REQUIRED_RESULT QString configLocation() const = 0;
virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
Q_REQUIRED_RESULT virtual QString configLocation() const = 0;
Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
virtual void addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentities, int oldUid) = 0;
virtual void importCustomMailTransport(const QString &identifierValue, const KConfigGroup &group, int defaultTransport, int transportId) = 0;
virtual void importSmtpMailTransport(const SmtpMailTransport &smtpMailTransport, int defaultTransport, int transportId) = 0;
......
......@@ -25,9 +25,9 @@ public:
protected:
virtual void convertCollectionIdsToRealPath(KConfigGroup &selectFolderNoteGroup, const QString &selectFolderNoteGroupStr) = 0;
virtual void exportResourceToArchive(const QString &archivePath, const QString &url, const QString &identifier) = 0;
virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> listOfResource() = 0;
void slotNoteJobTerminated();
virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) const = 0;
Q_REQUIRED_RESULT QString resourceArchiveName() const;
private:
......
......@@ -20,9 +20,9 @@ public:
void start() override;
protected:
virtual Q_REQUIRED_RESULT QString configLocation() const;
Q_REQUIRED_RESULT virtual QString configLocation() const;
virtual void synchronizeResource(const QStringList &lst) = 0;
virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData) = 0;
void slotNextStep() override;
Q_REQUIRED_RESULT QString installConfigLocation() const;
......
......@@ -23,11 +23,11 @@ public:
Q_REQUIRED_RESULT QString resourcePath(const QString &agentIdentifier, const QString &defaultPath = QString());
Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr &resourceConfig, const QString &storedData);
Q_REQUIRED_RESULT QString resourcePath(const KSharedConfigPtr &resourceConfig, const QString &defaultPath = QString());
virtual Q_REQUIRED_RESULT QString changeResourcePath(QString url) const;
Q_REQUIRED_RESULT virtual QString changeResourcePath(QString url) const;
virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
virtual Q_REQUIRED_RESULT Akonadi::Collection::Id convertFolderPathToCollectionId(const QString &path) = 0;
Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const qlonglong collectionValue) = 0;
Q_REQUIRED_RESULT virtual Akonadi::Collection::Id convertFolderPathToCollectionId(const QString &path) = 0;
Q_REQUIRED_RESULT QString storeResources(KZip *archive, const QString &identifier, const QString &path);
virtual Q_REQUIRED_RESULT QString installDefaultDirectory() = 0;
Q_REQUIRED_RESULT virtual QString installDefaultDirectory() = 0;
virtual QString adaptNewResourceUrl(bool overwriteResources, const KSharedConfig::Ptr &resourceConfig, const QString &storePath) = 0;
};
Supports Markdown
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