Replace custom Array with std::vector - friendly version

[xonotic/netradiant.git] / radiant / patch.h

diff --git a/radiant/patch.h b/radiant/patch.h
index cadb0e13bf9de03696f902615d67ba4510af09df..9e1bb16d99f085cf74b131ab63c25898ed5e3fe2 100644 (file)
--- a/radiant/patch.h
+++ b/radiant/patch.h
@@ -861,20 +861,20 @@ int getShaderFlags() const {
        return 0;
 }
 
-typedef PatchControl* iterator;
-typedef const PatchControl* const_iterator;
+typedef PatchControlArray::iterator iterator;
+typedef PatchControlArray::const_iterator const_iterator;
 
 iterator begin(){
-       return m_ctrl.data();
+       return m_ctrl.begin();
 }
 const_iterator begin() const {
-       return m_ctrl.data();
+       return m_ctrl.begin();
 }
 iterator end(){
-       return m_ctrl.data() + m_ctrl.size();
+       return m_ctrl.end();
 }
 const_iterator end() const {
-       return m_ctrl.data() + m_ctrl.size();
+       return m_ctrl.end();
 }
 
 PatchControlArray& getControlPoints(){
@@ -1557,7 +1557,7 @@ bool selectedVertices(){
 
 void transformComponents( const Matrix4& matrix ){
        if ( selectedVertices() ) {
-               PatchControlIter ctrl = m_patch.getControlPointsTransformed().begin();
+               PatchControlIter ctrl = m_patch.getControlPointsTransformed().data();
                for ( PatchControlInstances::iterator i = m_ctrl_instances.begin(); i != m_ctrl_instances.end(); ++i, ++ctrl )
                {
                        if ( ( *i ).m_selectable.isSelected() ) {