diff --git a/src/common/KReportDataSource.h b/src/common/KReportDataSource.h
index 4761af6c..89490b47 100644
--- a/src/common/KReportDataSource.h
+++ b/src/common/KReportDataSource.h
@@ -1,135 +1,135 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007-2010 by Adam Pigg (adam@piggz.co.uk)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef KREPORTDATA_H
 #define KREPORTDATA_H
 
 #include <QStringList>
 #include <QVariant>
 
 #include "kreport_export.h"
 #include "config-kreport.h"
 
 /*!
  * @brief Abstraction of report data source.
  *
  * A data source provides data to the report engine, usually from a
  * database, but could also be implemented for text and other file formats
  */
 class KREPORT_EXPORT KReportDataSource
 {
 
 public:
     KReportDataSource();
     virtual ~KReportDataSource();
 
     /*!
      * @brief Describes sorting for single field,
      * By default the order is ascending.
      */
     class KREPORT_EXPORT SortedField
     {
     public:
         SortedField();
         SortedField(const SortedField& other);
         ~SortedField();
         SortedField& operator=(const SortedField &other);
         bool operator==(const SortedField &other) const;
         bool operator!=(const SortedField &other) const;
         void setField(const QString &field);
         void setOrder(Qt::SortOrder order);
         QString field() const;
         Qt::SortOrder order() const;
 
         private:
             class Private;
             Private * const d;
     };
 
     //! Open the dataset
     virtual bool open() = 0;
 
     //! Close the dataset
     virtual bool close() = 0;
 
     //! Move to the next record
     virtual bool moveNext() = 0;
 
     //! Move to the previous record
     virtual bool movePrevious() = 0;
 
     //! Move to the first record
     virtual bool moveFirst() = 0;
 
     //! Move to the last record
     virtual bool moveLast() = 0;
 
     //! Return the current position in the dataset
     virtual qint64 at() const = 0;
 
     //! Return the total number of records
     virtual qint64 recordCount() const = 0;
 
     //! Return the index number of the field given by nane field
     virtual int fieldNumber(const QString &field) const = 0;
 
     //! Return the list of field names
     virtual QStringList fieldNames() const = 0;
 
     //! Return the list of field keys. Returns fieldNames() by default
     virtual QStringList fieldKeys() const;
 
     //! Return the value of the field at the given position for the current record
     virtual QVariant value(int pos) const = 0;
 
     //! Return the value of the field fir the given name for the current record
     virtual QVariant value(const QString &field) const = 0;
 
     //! Return the name of this source
     virtual QString sourceName() const;
 
     //! @return the class name of this source
     virtual QString sourceClass() const;
 
     //! Sets the sorting for the data
     //! Should be called before open() so that the data source can be edited accordingly
     //! Default impl does nothing
     virtual void setSorting(const QList<SortedField> &sorting);
 
     //! Adds a condition to the data source
     virtual void addCondition(const QString &field, const QVariant &value, const QString& relation = QLatin1String("="));
 
     //! Return a list of data source names available for this data source
     //! Works after the source is opened
     virtual QStringList dataSourceNames() const = 0;
 
     //! Return data source caption for specified @a dataSourceName
     //! It is possibly translated. As such it is suitable for use in GUIs.
     //! Default implementation just returns @a dataSourceName.
     virtual QString dataSourceCaption(const QString &dataSourceName) const;
 
     //! Creates a new instance with data source. Default implementation returns @c nullptr.
     //! @a source is implementation-specific identifier.
     //! Owner of the returned pointer is the caller.
-    virtual KReportDataSource* create(const QString &source) const Q_REQUIRED_RESULT;
+    virtual Q_REQUIRED_RESULT KReportDataSource* create(const QString &source) const;
 
 private:
     Q_DISABLE_COPY(KReportDataSource)
     class Private;
     Private * const d;
 };
 
 #endif
diff --git a/src/common/KReportPluginManager.h b/src/common/KReportPluginManager.h
index a8c4efcf..9ea01804 100644
--- a/src/common/KReportPluginManager.h
+++ b/src/common/KReportPluginManager.h
@@ -1,67 +1,67 @@
 /* This file is part of the KDE project
    Copyright (C) 2010 by Adam Pigg (adam@piggz.co.uk)
    Copyright (C) 2015 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef KREPORTPLUGINMANAGER_H
 #define KREPORTPLUGINMANAGER_H
 
 #include "config-kreport.h"
 #include "kreport_export.h"
 
 #include <QList>
 #include <QObject>
 
 class KReportPluginMetaData;
 class KReportPluginInterface;
 
 class QStringList;
 class QAction;
 class QString;
 
 /*!
  * @brief Manager class for finding and loading available plugins
  */
 class KREPORT_EXPORT KReportPluginManager : public QObject
 {
     Q_OBJECT
     public:
         static KReportPluginManager* self();
 
         QStringList pluginIds() const;
 
         const KReportPluginMetaData *pluginMetaData(const QString& id) const;
 
         KReportPluginInterface* plugin(const QString& id) const;
 
-        QList<QAction*> createActions(QObject *parent) Q_REQUIRED_RESULT;
+        Q_REQUIRED_RESULT QList<QAction*> createActions(QObject *parent);
 
     private:
         // class for access to the constructor
         friend class KReportPluginManagerSingleton;
 
         KReportPluginManager();
 
         ~KReportPluginManager() override;
 
         Q_DISABLE_COPY(KReportPluginManager)
         class Private;
         Private *const d;
 };
 
 #endif // KREPORTPLUGINMANAGER_H
diff --git a/src/wrtembed/KReportDesigner.h b/src/wrtembed/KReportDesigner.h
index 404c8fd4..b5b64a30 100644
--- a/src/wrtembed/KReportDesigner.h
+++ b/src/wrtembed/KReportDesigner.h
@@ -1,359 +1,359 @@
 /* This file is part of the KDE project
  * Copyright (C) 2001-2007 by OpenMFG, LLC <info@openmfg.com>
  * Copyright (C) 2007-2008 by Adam Pigg <adam@piggz.co.uk>
  * Copyright (C) 2011-2017 Jarosław Staniek <staniek@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef KREPORTDESIGNER_H
 #define KREPORTDESIGNER_H
 
 #include <QWidget>
 
 #include "KReportDocument.h"
 #include "KReportDataSource.h"
 
 class KProperty;
 class KPropertySet;
 
 class KReportItemBase;
 
 class QGraphicsScene;
 class QActionGroup;
 class QGraphicsSceneContextMenuEvent;
 class QString;
 
 class KReportDesignerSectionDetail;
 class KReportDesignerSection;
 class KReportUnit;
 class KReportDesignerSectionScene;
 class KReportDesignerSectionView;
 class QAction;
 
 #ifdef KREPORT_SCRIPTING
 class KReportScriptSource;
 #endif
 
 
 /*!
  * @brief The ReportDesigner is the main widget for designing a report
  */
 class KREPORT_EXPORT KReportDesigner : public QWidget
 {
     Q_OBJECT
 public:
     /**
     @brief Constructor that create a blank designer
     @param parent QWidget parent
     */
     explicit KReportDesigner(QWidget *parent = nullptr);
 
     /**
     @brief Constructor that create a designer, and loads the report described in the QDomElement
     @param parent QWidget parent
     @param desc Report structure XML element
     */
     KReportDesigner(QWidget *parent, const QDomElement &desc);
 
     /**
     @brief Desctructor
     */
     ~KReportDesigner() override;
 
     /**
     @brief Sets the report data
     The report data interface contains functions to retrieve data
     and information about the fields.
     @param source Pointer to KReportDataSource instance, ownership is transferred
     */
     void setDataSource(KReportDataSource* source);
 
 #ifdef KREPORT_SCRIPTING
     /**
     @brief Sets the script source for the designer
     The script source contains function to return scripts supplied by the parent application
     @param source Pointer to KReportScriptSource instance, ownership is NOT transferred as it may be an application window
     */
     void setScriptSource(KReportScriptSource *source);
 #endif
 
     /**
     @brief Return a pointer to the reports data
     @return Pointer to report data
     */
     KReportDataSource *reportDataSource() const;
 
     /**
     @brief Return a pointer to the section specified
     @param type KReportSectionData::Section enum value of the section to return
     @return Pointer to report section object, or 0 if no section exists
     */
     KReportDesignerSection* section(KReportSectionData::Type type) const;
 
     /**
     @brief Creates new section
     @return Pointer to a new report section section object, ownership is transferred to
             the caller
     */
-    KReportDesignerSection* createSection() Q_REQUIRED_RESULT;
+    Q_REQUIRED_RESULT KReportDesignerSection* createSection();
 
     /**
     @brief Deletes the section specified
     @param type KReportSectionData::Section enum value of the section to return
     */
     void removeSection(KReportSectionData::Type type);
 
     /**
     @brief Create a new section and insert it into the report
     @param type KReportSectionData::Section enum value of the section to return
     */
     void insertSection(KReportSectionData::Type type);
 
     /**
     @brief Return a pointer to the detail section.
     The detail section contains the actual detail section and related group sections
     @return Pointer to detail section
     */
     KReportDesignerSectionDetail* detailSection() const;
 
     /**
     @brief Sets the title of the reportData
     @param title Report Title
     */
     void setReportTitle(const QString &title);
 
     /**
     @brief Sets the parameters for the display of the background gridpoints
     @param visible Grid visibility
     @param divisions Number of minor divisions between major points
     */
     void setGridOptions(bool visible, int divisions);
 
     /**
     @brief Return the title of the report
     */
     QString reportTitle() const;
 
     /**
     @brief Return an XML description of the report
     @return QDomElement describing the report definition
     */
     QDomElement document() const;
 
     /**
     @brief Return true if the design has been modified
     @return modified status
     */
     bool isModified() const;
 
     /**
     @return a list of field names in the selected KReportData
     */
     QStringList fieldNames() const;
 
     /**
     @return a list of field keys in the selected KReportData
     The keys can be used to reference the names
     */
     QStringList fieldKeys() const;
 
     /**
     @brief Calculate the width of the page in pixels given the paper size, orientation, dpi and margin
     @return integer value of width in pixels
     */
     int pageWidthPx() const;
 
     /**
     @return the scene (section) that is currently active
     */
     QGraphicsScene* activeScene() const;
 
     /**
     @brief Sets the active Scene
     @param scene The scene to make active
     */
     void setActiveScene(QGraphicsScene* scene);
 
     /**
     @return the property set for the general report properties
     */
     KPropertySet* propertySet() const;
 
     /**
     @brief Give a hint on the size of the widget
     */
     QSize sizeHint() const override;
 
     /**
     @brief Return the current unit assigned to the report
     */
     KReportUnit pageUnit() const;
 
     /**
     @brief Handle the context menu event for a report section
     @param scene The associated scene (section)
     */
     void sectionContextMenuEvent(KReportDesignerSectionScene *scene, QGraphicsSceneContextMenuEvent * event);
 
     /**
     @brief Handle the mouse release event for a report section
     */
     void sectionMouseReleaseEvent(KReportDesignerSectionView *v, QMouseEvent * e);
 
     void sectionMousePressEvent(KReportDesignerSectionView *v, QMouseEvent * e);
 
     /**
     @brief Sets the property set for the currently selected item
     @param set Property set of item
     */
     void changeSet(KPropertySet *set);
 
     /**
     @brief Return the property set for the curently selected item
     */
     KPropertySet* selectedItemPropertySet() const;
 
     /**
     @brief Sets the modified status, defaulting to true for modified
     @param modified Modified status
     */
     void setModified(bool modified);
 
     /**
     @brief Return a unique name that can be used by the entity
     @param name Name of entity
     */
     QString suggestEntityName(const QString &name) const;
 
     /**
     @brief Checks if the supplied name is unique among all entities
     */
     bool isEntityNameUnique(const QString &name, KReportItemBase *ignore = nullptr) const;
 
     /**
     @brief Returns a list of actions that represent the entities that can be inserted into the report.
     Actions are created as children of @a group and belong to the group.
     @return list of actions */
     static QList<QAction*> itemActions(QActionGroup* group = nullptr);
 
     /**
     @brief Populates the toolbar with actions that can be applied to the report
     Actions are created as children of @a group and belong to the group.
     @return list of actions */
     QList<QAction*> designerActions();
 
     /**
     @return X position of mouse when mouse press occurs
     */
     qreal getSelectionPressX() const;
 
     /**
     @return Y position of mouse when mouse press occurs
     */
     qreal getSelectionPressY() const;
 
     /**
     @return difference between X position of mouse release and press
     */
     qreal countSelectionWidth() const;
 
     /**
     @return difference between Y position of mouse release and press
     */
     qreal countSelectionHeight() const;
 
     /**
     @return point that contains X,Y coordinates of mouse press
     */
     QPointF getPressPoint() const;
 
     /**
     @return point that contains X,Y coordinates of mouse press
     */
     QPointF getReleasePoint() const;
 
     void plugItemActions(const QList<QAction*> &actList);
 
     /**
      * @brief Adds meta-properties to the property set @a set for consumption by property editor
      * - "this:classString" - user-visible translated name of element type, e.g. tr("Label")
      * - "this:iconName" - name of user-visible icon, e.g. "kreport-label-element"
      *
      * All the properties are set to invisible.
      * @see propertySet()
      */
     static void addMetaProperties(KPropertySet* set, const QString &classString,
                                   const QString &iconName);
 
 public Q_SLOTS:
 
     void slotEditDelete();
     void slotEditCut();
     void slotEditCopy();
     void slotEditPaste();
     void slotEditPaste(QGraphicsScene *);
 
     void slotItem(const QString&);
 
     void slotSectionEditor();
 
     void slotRaiseSelected();
     void slotLowerSelected();
 
 private:
     /**
     @brief Sets the detail section to the given section
     */
     void setDetail(KReportDesignerSectionDetail *rsd);
 
     void resizeEvent(QResizeEvent * event) override;
 
     //Properties
     void createProperties();
 
     unsigned int selectionCount() const;
 
     void setSectionCursor(const QCursor&);
     void unsetSectionCursor();
 
     void createActions();
 
     QSize pageSizePt() const;
 
     void recalculateMaxMargins();
 
 private Q_SLOTS:
     void slotPropertyChanged(KPropertySet &s, KProperty &p);
 
     /**
     @brief When the 'page' button in the top left is pressed, change the property set to the reports properties.
     */
     void slotPageButton_Pressed();
 
     void slotItemTriggered(bool checked);
 
 Q_SIGNALS:
     void pagePropertyChanged(KPropertySet &s);
     void propertySetChanged();
     void dirty();
     void reportDataChanged();
     void itemInserted(const QString& entity);
 
 private:
     Q_DISABLE_COPY(KReportDesigner)
     class Private;
     Private * const d;
 };
 
 #endif