App: use forward declarations

src/App/Application.h

@@ -31,13 +31,15 @@
 
 #include <Base/Observer.h>
 #include <Base/Parameter.h>
-#include <Base/PyObjectBase.h>
 
+// forward declarations
+typedef struct _object PyObject;
+typedef struct PyMethodDef PyMethodDef;
 
 namespace Base
 {
-    class ConsoleObserverStd;
-    class ConsoleObserverFile;
+class ConsoleObserverStd;
+class ConsoleObserverFile;
 }
 
 namespace App

src/App/DocumentObjectExtension.h

@@ -25,8 +25,10 @@
 #define APP_DOCUMENTOBJECTEXTENSION_H
 
 #include "Extension.h"
-#include <Base/Matrix.h>
 
+namespace Base {
+class Matrix4D;
+}
 namespace App {
 class DocumentObject;
 class DocumentObjectExecReturn;
@@ -40,7 +42,7 @@ class AppExport DocumentObjectExtension : public App::Extension
 
     //The cass does not have properties itself, but it is important to provide the property access
     //functions. see cpp file for details
-    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::DocumentObjectExtension );
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::DocumentObjectExtension);
 
 public:
 
@@ -51,8 +53,8 @@ public:
     const App::DocumentObject* getExtendedObject() const;
 
     //override if execution is necessary
-    virtual short extensionMustExecute(void);
-    virtual App::DocumentObjectExecReturn *extensionExecute(void);
+    virtual short extensionMustExecute();
+    virtual App::DocumentObjectExecReturn *extensionExecute();
 
 
     /// get called after setting the document
@@ -64,18 +66,18 @@ public:
     /// get called when object is going to be removed from the document
     virtual void onExtendedUnsetupObject();
 
-    virtual PyObject* getExtensionPyObject(void) override;
+    virtual PyObject* getExtensionPyObject() override;
 
     /// returns the type name of the ViewProviderExtension which is automatically attached
     /// to the viewprovider object when it is initiated
-    virtual const char* getViewProviderExtensionName(void) const {return "";}
+    virtual const char* getViewProviderExtensionName() const {return "";}
 
     /** Get the sub object by name
      * @sa DocumentObject::getSubObject()
      *
      * @return Return turn if handled, the sub object is returned in \c ret
      */
-    virtual bool extensionGetSubObject( DocumentObject *&ret, const char *subname,
+    virtual bool extensionGetSubObject(DocumentObject *&ret, const char *subname,
         PyObject **pyObj, Base::Matrix4D *mat, bool transform, int depth) const;
 
     /** Get name references of all sub objects

src/App/DocumentObjectGroup.h

@@ -38,15 +38,15 @@ class AppExport DocumentObjectGroup : public DocumentObject, public GroupExtensi
 
 public:
     /// Constructor
-    DocumentObjectGroup(void);
+    DocumentObjectGroup();
     virtual ~DocumentObjectGroup();
 
     /// returns the type name of the ViewProvider
-    virtual const char* getViewProviderName(void) const override{
+    virtual const char* getViewProviderName() const override {
         return "Gui::ViewProviderDocumentObjectGroup";
     }
 
-    virtual PyObject *getPyObject(void) override;
+    virtual PyObject *getPyObject() override;
 };
 
 typedef App::FeaturePythonT<DocumentObjectGroup> DocumentObjectGroupPython;

src/App/DocumentObserverPython.cpp

@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 
+#include <CXX/Objects.hxx>
 #include "Application.h"
 #include "Document.h"
 #include "DocumentObject.h"

src/App/ExtensionContainer.cpp

@@ -25,6 +25,8 @@
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
 #include "Extension.h"
 #include "ExtensionContainer.h"

src/App/ExtensionContainer.h

@@ -24,9 +24,6 @@
 #ifndef APP_EXTENSIONCONTAINER_H
 #define APP_EXTENSIONCONTAINER_H
 
-#include <Base/Reader.h>
-#include <Base/Writer.h>
-
 #include "PropertyContainer.h"
 
 

src/App/ObjectIdentifier.cpp

@@ -34,6 +34,7 @@
 #include <Base/Interpreter.h>
 #include <Base/QuantityPy.h>
 #include <Base/Console.h>
+#include <Base/Reader.h>
 #include <CXX/Objects.hxx>
 
 #include "ObjectIdentifier.h"

src/App/Part.h

@@ -76,11 +76,11 @@ public:
     //@}
 
     /// Constructor
-    Part(void);
+    Part();
     virtual ~Part();
 
     /// returns the type name of the ViewProvider
-    virtual const char* getViewProviderName(void) const override {
+    virtual const char* getViewProviderName() const override {
         return "Gui::ViewProviderPart";
     }
 
@@ -95,7 +95,7 @@ public:
      */
     static App::Part* getPartOfObject (const DocumentObject* obj, bool recursive=true);
 
-    virtual PyObject *getPyObject(void) override;
+    virtual PyObject *getPyObject() override;
 };
 
 //typedef App::FeaturePythonT<Part> PartPython;

src/App/PropertyExpressionEngine.cpp

@@ -28,6 +28,7 @@
 #include <Base/Reader.h>
 #include <Base/Tools.h>
 #include <Base/Writer.h>
+#include <CXX/Objects.hxx>
 
 #include "PropertyExpressionEngine.h"
 #include "ExpressionVisitors.h"

src/Gui/ApplicationPy.cpp

@@ -31,6 +31,7 @@
 # include <Inventor/SoInput.h>
 # include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/nodes/SoSeparator.h>
+# include <xercesc/util/XMLString.hpp>
 #endif
 
 #include <boost/regex.hpp>

src/Gui/Tree.cpp

@@ -40,8 +40,10 @@
 #endif
 
 #include <Base/Console.h>
+#include <Base/Reader.h>
 #include <Base/Sequencer.h>
 #include <Base/Tools.h>
+#include <Base/Writer.h>
 
 #include <App/DocumentObjectGroup.h>
 #include <App/AutoTransaction.h>

src/Main/FreeCADGuiPy.cpp

@@ -44,6 +44,7 @@
 #include <Base/Exception.h>
 #include <Base/Factory.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>

src/Main/MainPy.cpp

@@ -47,6 +47,7 @@
 
 // FreeCAD Base header
 #include <Base/Exception.h>
+#include <Base/PyObjectBase.h>
 #include <Base/Sequencer.h>
 #include <App/Application.h>
 

src/Mod/Drawing/Gui/AppDrawingGui.cpp

@@ -27,6 +27,7 @@
 #endif
 
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include "Workbench.h"

src/Mod/Fem/App/PropertyPostDataObject.cpp

@@ -47,6 +47,7 @@
 #include <Base/Reader.h>
 #include <App/Application.h>
 #include <App/DocumentObject.h>
+#include <CXX/Objects.hxx>
 
 #include "PropertyPostDataObject.h"
 

src/Mod/Fem/Gui/AppFemGui.cpp

@@ -29,6 +29,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>

src/Mod/Image/Gui/AppImageGui.cpp

@@ -16,6 +16,7 @@
 #endif
 
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include "ImageView.h"

src/Mod/Import/Gui/AppImportGui.cpp

@@ -29,6 +29,7 @@
 #include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
 #include <Gui/Application.h>
 

src/Mod/Inspection/Gui/AppInspectionGui.cpp

@@ -30,6 +30,7 @@
 #include <CXX/Objects.hxx>
 
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 
 #include "ViewProviderInspection.h"

src/Mod/Mesh/Gui/AppMeshGui.cpp

@@ -31,6 +31,7 @@
 
 #include <Base/Interpreter.h>
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 
 #include <CXX/Extensions.hxx>
 #include <CXX/Objects.hxx>

src/Mod/MeshPart/Gui/AppMeshPartGui.cpp

@@ -30,6 +30,7 @@
 #include <CXX/Objects.hxx>
 
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include "CurveOnMesh.h"

src/Mod/Part/Gui/AppPartGui.cpp

@@ -18,6 +18,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/WidgetFactory.h>

src/Mod/PartDesign/Gui/AppPartDesignGui.cpp

@@ -31,6 +31,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 

src/Mod/Path/Gui/AppPathGui.cpp

@@ -28,6 +28,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>

src/Mod/Points/Gui/AppPointsGui.cpp

@@ -33,6 +33,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include <Mod/Points/App/PropertyPointKernel.h>

src/Mod/Raytracing/Gui/AppRaytracingGui.cpp

@@ -25,6 +25,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>

src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp

@@ -28,6 +28,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include "Workbench.h"

src/Mod/Robot/Gui/AppRobotGui.cpp

@@ -31,6 +31,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include "ViewProviderRobotObject.h"

src/Mod/Sketcher/Gui/AppSketcherGui.cpp

@@ -31,6 +31,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Language/Translator.h>

src/Mod/Spreadsheet/Gui/SheetTableView.cpp

@@ -37,6 +37,8 @@
 #include <App/Application.h>
 #include <App/AutoTransaction.h>
 #include <App/Document.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 #include <Gui/CommandT.h>
 #include <Gui/Application.h>
 #include <Gui/MainWindow.h>

src/Mod/Start/Gui/AppStartGui.cpp

@@ -31,6 +31,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/WorkbenchManager.h>
 #include <Gui/Language/Translator.h>

src/Mod/TechDraw/Gui/mrichtextedit.h

@@ -52,14 +52,14 @@ class MRichTextEdit : public QWidget, protected Ui::MRichTextEdit {
     int getDefFontSizeNum(void);
     QFont getDefFont(void);
    
-  public slots:
+  public Q_SLOTS:
     void setText(const QString &text);
 
 Q_SIGNALS:
     void saveText(QString revText);
     void editorFinished();
 
-  protected slots:
+  protected Q_SLOTS:
     void onSave(void);
     void onExit(void);
     void setPlainText(const QString &text) { f_textedit->setPlainText(text); }

src/Mod/Web/Gui/AppWebGui.cpp

@@ -32,6 +32,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/MainWindow.h>
 #include <Gui/WorkbenchManager.h>