Finish prefixing everything with "Ei"

4 files changed, 18 insertions, 18 deletions

diff --git a/test/main.h b/test/main.h
index 0ae9967b5..1cdc781d7 100644
--- a/test/main.h
+++ b/test/main.h
@@ -23,8 +23,8 @@
 // License. This exception does not invalidate any other reasons why a work
 // based on this file might be covered by the GNU General Public License.
 
-#ifndef EIGEN_TEST_MAIN_H
-#define EIGEN_TEST_MAIN_H
+#ifndef EI_TEST_MAIN_H
+#define EI_TEST_MAIN_H
 
 #include <QtTest/QtTest>
 #include <All>
@@ -47,4 +47,4 @@ class EigenTest : public QObject
     void testMatrixManip();
 };
 
-#endif // EIGEN_TEST_MAIN_H
+#endif // EI_TEST_MAIN_H
diff --git a/test/matrixmanip.cpp b/test/matrixmanip.cpp
index 608dc1dad..4851a9178 100644
--- a/test/matrixmanip.cpp
+++ b/test/matrixmanip.cpp
@@ -44,9 +44,9 @@ template<typename MatrixType> void matrixManip(const MatrixType& m)
 
 void EigenTest::testMatrixManip()
 {
-  matrixManip(Matrix<int, 2, 3>());
-  matrixManip(Matrix<double, 3, 3>());
-  matrixManip(Matrix<complex<float>, 4,3>());
+  matrixManip(EiMatrix<int, 2, 3>());
+  matrixManip(EiMatrix<double, 3, 3>());
+  matrixManip(EiMatrix<complex<float>, 4,3>());
   matrixManip(EiMatrixXi(2, 2));
   matrixManip(EiMatrixXd(3, 5));
   matrixManip(EiMatrixXcf(4, 4));
diff --git a/test/matrixops.cpp b/test/matrixops.cpp
index 059cb6126..e5f01759e 100644
--- a/test/matrixops.cpp
+++ b/test/matrixops.cpp
@@ -58,14 +58,14 @@ template<typename MatrixType1,
 
 void EigenTest::testMatrixOps()
 {
-  matrixOps(Matrix<float, 1, 1>(), Matrix<float, 1, 1>());
-  matrixOps(Matrix<int, 2, 3>(), Matrix<int, 3, 1>());
-  matrixOps(Matrix<double, 3, 3>(), Matrix<double, 3, 3>());
-  matrixOps(Matrix<complex<float>, 4,3>(), Matrix<complex<float>, 3,4>());
+  matrixOps(EiMatrix<float, 1, 1>(), EiMatrix<float, 1, 1>());
+  matrixOps(EiMatrix<int, 2, 3>(), EiMatrix<int, 3, 1>());
+  matrixOps(EiMatrix<double, 3, 3>(), EiMatrix<double, 3, 3>());
+  matrixOps(EiMatrix<complex<float>, 4,3>(), EiMatrix<complex<float>, 3,4>());
   matrixOps(EiMatrixXf(1, 1), EiMatrixXf(1, 3));
   matrixOps(EiMatrixXi(2, 2), EiMatrixXi(2, 2));
   matrixOps(EiMatrixXd(3, 5), EiMatrixXd(5, 1));
   matrixOps(EiMatrixXcf(4, 4), EiMatrixXcf(4, 4));
-  matrixOps(EiMatrixXd(3, 5), Matrix<double, 5, 1>());
+  matrixOps(EiMatrixXd(3, 5), EiMatrix<double, 5, 1>());
   matrixOps(EiMatrix4cf(), EiMatrixXcf(4, 4));
 }
diff --git a/test/vectorops.cpp b/test/vectorops.cpp
index 1ac9c45df..b061206c2 100644
--- a/test/vectorops.cpp
+++ b/test/vectorops.cpp
@@ -53,11 +53,11 @@ template<typename VectorType> void vectorOps(const VectorType& v)
 
 void EigenTest::testVectorOps()
 {
-  vectorOps(Vector2i());
-  vectorOps(Vector3d());
-  vectorOps(Vector4cf());
-  vectorOps(VectorXf(1));
-  vectorOps(VectorXi(2));
-  vectorOps(VectorXd(3));
-  vectorOps(VectorXcf(4));
+  vectorOps(EiVector2i());
+  vectorOps(EiVector3d());
+  vectorOps(EiVector4cf());
+  vectorOps(EiVectorXf(1));
+  vectorOps(EiVectorXi(2));
+  vectorOps(EiVectorXd(3));
+  vectorOps(EiVectorXcf(4));
 }