1 files changed, 16 insertions, 14 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 7a6a499536..7f03849798 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -49,26 +49,30 @@ struct WriteIncludes : public TreeWalker
 {
     WriteIncludes(Uic *uic);
 
-    void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
-    void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
-    void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE;
-    void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE;
-    void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE;
-    void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &) Q_DECL_OVERRIDE;
+    void acceptUI(DomUI *node) override;
+    void acceptWidget(DomWidget *node) override;
+    void acceptLayout(DomLayout *node) override;
+    void acceptSpacer(DomSpacer *node) override;
+    void acceptProperty(DomProperty *node) override;
+
+//
+// actions
+//
+    void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE;
+    void acceptAction(DomAction *node) Q_DECL_OVERRIDE;
+    void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE;
 
 //
 // custom widgets
 //
-    void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE;
-    void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE;
+    void acceptCustomWidgets(DomCustomWidgets *node) override;
+    void acceptCustomWidget(DomCustomWidget *node) override;
 
 //
 // include hints
 //
-    void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE;
-    void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE;
-
-    bool scriptsActivated() const { return m_scriptsActivated; }
+    void acceptIncludes(DomIncludes *node) override;
+    void acceptInclude(DomInclude *node) override;
 
 private:
     void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false);
@@ -79,7 +83,6 @@ private:
     void insertInclude(const QString &header, bool global);
     void writeHeaders(const OrderedSet &headers, bool global);
     QString headerForClassName(const QString &className) const;
-    void activateScripts();
 
     const Uic *m_uic;
     QTextStream &m_output;
@@ -94,7 +97,6 @@ private:
     StringMap m_classToHeader;
     StringMap m_oldHeaderToNewHeader;
 
-    bool m_scriptsActivated;
     bool m_laidOut;
 };