use math/vectorfwd.h

include/cullable.h

@@ -22,9 +22,8 @@
 #pragma once
 
 #include "generic/constant.h"
+#include "math/vectorfwd.h"
 
-template<typename Element> class BasicVector3;
-typedef BasicVector3<float> Vector3;
 template<typename T> class Plane3___;
 typedef Plane3___<double> Plane3;
 class Matrix4;

include/icamera.h

@@ -46,8 +46,7 @@ public:
 	virtual void setCameraView( CameraView* view, const Callback<void()>& disconnect ) = 0;
 };
 
-template<typename Element> class BasicVector3;
-typedef BasicVector3<float> Vector3;
+#include "math/vectorfwd.h"
 
 typedef void ( *PFN_GETCAMERA )( Vector3& origin, Vector3& angles );
 typedef void ( *PFN_SETCAMERA )( const Vector3& origin, const Vector3& angles );

include/iselection.h

@@ -25,6 +25,7 @@
 #include "generic/constant.h"
 #include "generic/callback.h"
 #include "signal/signalfwd.h"
+#include "math/vectorfwd.h"
 
 class Renderer;
 class View;
@@ -49,10 +50,6 @@ public:
 	virtual void onSelectedChanged( scene::Instance& instance ) = 0;
 };
 
-template<typename Element> class BasicVector3;
-typedef BasicVector3<float> Vector3;
-template<typename Element> class BasicVector4;
-typedef BasicVector4<float> Vector4;
 typedef Vector4 Quaternion;
 
 class AABB;

include/qerplugin.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "generic/constant.h"
+#include "generic/vector.h"
 
 
 // ========================================
@@ -64,10 +65,9 @@ typedef EMessageBoxReturn ( *PFN_QERAPP_MESSAGEBOX )( QWidget *parent, const cha
 typedef const char* ( *PFN_QERAPP_FILEDIALOG )( QWidget *parent, bool open, const char* title, const char* path /* = 0*/, const char* pattern /* = 0*/, bool want_load /* = false*/, bool want_import /* = false*/, bool want_save /* = false*/ );
 
 typedef QString ( *PFN_QERAPP_DIRDIALOG )( QWidget *parent, const QString& path /* = {} */ );
+
 // return true if the user closed the dialog with 'Ok'
 // 'color' is used to set the initial value and store the selected value
-template<typename Element> class BasicVector3;
-typedef BasicVector3<float> Vector3;
 typedef bool ( *PFN_QERAPP_COLORDIALOG )( QWidget *parent, Vector3& color,
                                           const char* title /* = "Choose Color"*/ );
 
@@ -87,7 +87,6 @@ class ModuleObserver;
 
 #include "signal/signalfwd.h"
 #include "windowobserver.h"
-#include "generic/vector.h"
 
 typedef SignalHandler3<const WindowVector&, ButtonIdentifier, ModifierFlags> MouseEventHandler;
 typedef SignalFwd<MouseEventHandler>::handler_id_type MouseEventHandlerId;

include/windowobserver.h

@@ -70,9 +70,7 @@ const ButtonIdentifier c_buttonMiddle( ButtonEnumeration::MIDDLE );
 const ButtonIdentifier c_buttonRight( ButtonEnumeration::RIGHT );
 
 
-template<typename Element>
-class BasicVector2;
-typedef BasicVector2<float> Vector2;
+#include "math/vectorfwd.h"
 typedef Vector2 WindowVector;
 
 class WindowObserver