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

"virtual Q_REQUIRED_RESULT foo bar()" -> "Q_REQUIRED_RESULT virtual foo bar()"

src/composer-ng/richtextcomposerimages.h

@@ -96,7 +96,7 @@ public:
      *
      * @return a modified HTML code, where the \<img\> tags got replaced
      */
-    static Q_REQUIRED_RESULT QByteArray imageNamesToContentIds(const QByteArray &htmlBody, const ImageList &imageList);
+    Q_REQUIRED_RESULT static QByteArray imageNamesToContentIds(const QByteArray &htmlBody, const ImageList &imageList);
 
     Q_REQUIRED_RESULT QSharedPointer<EmbeddedImage> createEmbeddedImage(const QImage &img, const QString &imageName) const;
 

src/grantleebuilder/abstractmarkupbuilder.h

@@ -243,7 +243,7 @@ public:
 
     @return The fully marked up text.
   */
-    virtual Q_REQUIRED_RESULT QString getResult() = 0;
+    Q_REQUIRED_RESULT virtual QString getResult() = 0;
 
     virtual void addSingleBreakLine() = 0;
 };

src/grantleebuilder/markupdirector.h

@@ -94,7 +94,7 @@ public:
     Directs the builder to create output for the single @p frame. If calling
     this method directly, an invalid QTextFrame::iterator may be used.
   */
-    virtual Q_REQUIRED_RESULT QTextFrame::iterator processFrame(QTextFrame::iterator it, QTextFrame *frame);
+    Q_REQUIRED_RESULT virtual QTextFrame::iterator processFrame(QTextFrame::iterator it, QTextFrame *frame);
 
     /**
     Directs the builder to create output for the single @p block. If calling
@@ -103,7 +103,7 @@ public:
     This method does not process the contents of the @p block, but uses the
     @ref processBlockContents method to do so.
   */
-    virtual Q_REQUIRED_RESULT QTextFrame::iterator processBlock(QTextFrame::iterator it, const QTextBlock &block);
+    Q_REQUIRED_RESULT virtual QTextFrame::iterator processBlock(QTextFrame::iterator it, const QTextBlock &block);
 
     /**
     Directs the builder to create output for the single @p textObject. If
@@ -111,7 +111,7 @@ public:
 
     The block @p block is the container of the @p textObject.
   */
-    virtual Q_REQUIRED_RESULT QTextFrame::iterator processObject(QTextFrame::iterator it, const QTextBlock &block, QTextObject *textObject);
+    Q_REQUIRED_RESULT virtual QTextFrame::iterator processObject(QTextFrame::iterator it, const QTextBlock &block, QTextObject *textObject);
 
     /**
     Directs the builder to create output for the single @p textBlockGroup. If
@@ -119,7 +119,7 @@ public:
 
     The block @p block is the first block in the @p textBlockGroup.
   */
-    virtual Q_REQUIRED_RESULT QPair<QTextFrame::iterator, QTextBlock>
+    Q_REQUIRED_RESULT virtual QPair<QTextFrame::iterator, QTextBlock>
     processBlockGroup(const QTextFrame::iterator &it, const QTextBlock &block, QTextBlockGroup *textBlockGroup);
 
     /**
@@ -128,7 +128,7 @@ public:
 
     The block @p block is the first block in the @p textList.
   */
-    virtual Q_REQUIRED_RESULT QPair<QTextFrame::iterator, QTextBlock> processList(QTextFrame::iterator it, const QTextBlock &block, QTextList *textList);
+    Q_REQUIRED_RESULT virtual QPair<QTextFrame::iterator, QTextBlock> processList(QTextFrame::iterator it, const QTextBlock &block, QTextList *textList);
 
     /**
     Directs the builder to create output for the contents of the single @p
@@ -148,7 +148,7 @@ public:
     fragment. If calling this method directly, an invalid QTextBlock::iterator
     may be used. @p doc is the document the fragment is in.
   */
-    virtual Q_REQUIRED_RESULT QTextBlock::iterator processFragment(QTextBlock::iterator it, const QTextFragment &fragment, QTextDocument const *doc);
+    Q_REQUIRED_RESULT virtual QTextBlock::iterator processFragment(QTextBlock::iterator it, const QTextFragment &fragment, QTextDocument const *doc);
 
     /**
     Directs the builder to create output for the contents of the single @p
@@ -158,7 +158,7 @@ public:
     If calling this method directly, an invalid QTextBlock::iterator may be
     used.
   */
-    virtual Q_REQUIRED_RESULT QTextBlock::iterator processCharTextObject(QTextBlock::iterator it, const QTextFragment &fragment, QTextObject *textObject);
+    Q_REQUIRED_RESULT virtual QTextBlock::iterator processCharTextObject(QTextBlock::iterator it, const QTextFragment &fragment, QTextObject *textObject);
 
     /**
     Directs the builder to create output for the image represented by the @p
@@ -167,7 +167,7 @@ public:
     If calling this method directly, an invalid QTextBlock::iterator may be
     used. @p doc is the document the fragment is in.
   */
-    virtual Q_REQUIRED_RESULT QTextBlock::iterator processImage(QTextBlock::iterator it, const QTextImageFormat &imageFormat, QTextDocument const *doc);
+    Q_REQUIRED_RESULT virtual QTextBlock::iterator processImage(QTextBlock::iterator it, const QTextImageFormat &imageFormat, QTextDocument const *doc);
 
     /**
     Directs the builder to create output for the contents of the single @p
@@ -176,7 +176,7 @@ public:
     If calling this method directly, an invalid QTextFrame::iterator may be
     used.
   */
-    virtual Q_REQUIRED_RESULT QTextFrame::iterator processTable(QTextFrame::iterator it, QTextTable *table);
+    Q_REQUIRED_RESULT virtual QTextFrame::iterator processTable(QTextFrame::iterator it, QTextTable *table);
 
     /**
     Directs the builder to create output for the contents of the single @p
@@ -222,12 +222,12 @@ protected:
     /**
     Returns the tags that should be closed at the position of @p it.
   */
-    virtual Q_REQUIRED_RESULT QSet<int> getElementsToClose(const QTextBlock::iterator &it) const;
+    Q_REQUIRED_RESULT virtual QSet<int> getElementsToClose(const QTextBlock::iterator &it) const;
 
     /**
     Returns the tags that should be opened at the position of @p it.
   */
-    virtual Q_REQUIRED_RESULT QList<int> getElementsToOpen(const QTextBlock::iterator &it);
+    Q_REQUIRED_RESULT virtual QList<int> getElementsToOpen(const QTextBlock::iterator &it);
 
     /**
     Flags for the tags that may be open.

src/texteditor/commonwidget/texteditfindbarbase.h

@@ -40,10 +40,10 @@ Q_SIGNALS:
     void hideFindBar();
 
 protected:
-    virtual Q_REQUIRED_RESULT bool viewIsReadOnly() const = 0;
-    virtual Q_REQUIRED_RESULT bool documentIsEmpty() const = 0;
-    virtual Q_REQUIRED_RESULT bool searchInDocument(const QString &text, QTextDocument::FindFlags searchOptions) = 0;
-    virtual Q_REQUIRED_RESULT bool searchInDocument(const QRegularExpression &regExp, QTextDocument::FindFlags searchOptions) = 0;
+    Q_REQUIRED_RESULT virtual bool viewIsReadOnly() const = 0;
+    Q_REQUIRED_RESULT virtual bool documentIsEmpty() const = 0;
+    Q_REQUIRED_RESULT virtual bool searchInDocument(const QString &text, QTextDocument::FindFlags searchOptions) = 0;
+    Q_REQUIRED_RESULT virtual bool searchInDocument(const QRegularExpression &regExp, QTextDocument::FindFlags searchOptions) = 0;
     virtual void autoSearchMoveCursor() = 0;
 
     bool event(QEvent *e) override;

src/texttospeech/abstracttexttospeechconfiginterface.h

@@ -22,12 +22,12 @@ class KPIMTEXTEDIT_EXPORT AbstractTextToSpeechConfigInterface : public QObject
 public:
     explicit AbstractTextToSpeechConfigInterface(QObject *parent = nullptr);
     ~AbstractTextToSpeechConfigInterface() override;
-    virtual Q_REQUIRED_RESULT QVector<QLocale> availableLocales() const;
-    virtual Q_REQUIRED_RESULT QLocale locale() const;
+    Q_REQUIRED_RESULT virtual QVector<QLocale> availableLocales() const;
+    Q_REQUIRED_RESULT virtual QLocale locale() const;
     virtual void setLocale(const QLocale &locale);
 
-    virtual Q_REQUIRED_RESULT QStringList availableEngines() const;
-    virtual Q_REQUIRED_RESULT QStringList availableVoices() const;
+    Q_REQUIRED_RESULT virtual QStringList availableEngines() const;
+    Q_REQUIRED_RESULT virtual QStringList availableVoices() const;
     virtual void setEngine(const QString &engineName);
 };
 }

src/texttospeech/abstracttexttospeechinterface.h

@@ -20,9 +20,9 @@ public:
     explicit AbstractTextToSpeechInterface(QObject *parent = nullptr);
     ~AbstractTextToSpeechInterface() override;
 
-    virtual Q_REQUIRED_RESULT bool isReady() const;
+    Q_REQUIRED_RESULT virtual bool isReady() const;
     virtual void say(const QString &text);
-    virtual Q_REQUIRED_RESULT int volume() const;
+    Q_REQUIRED_RESULT virtual int volume() const;
     virtual void setVolume(int value);
     virtual void reloadSettings();
 };