Rename typedef

Author: dcwhite

src/Core/Datatypes/Legacy/Base/TypeName.h

@@ -110,11 +110,11 @@ template<class T, class S> std::string find_type_name( std::pair<T,S> *);
 class IntVector;
 class NrrdData;
 
-using Complex = std::complex<double>;
+using complex = std::complex<double>;
 
 template<> SCISHARE std::string find_type_name(float*);
 template<> SCISHARE std::string find_type_name(double*);
-template<> SCISHARE std::string find_type_name(Complex*);
+template<> SCISHARE std::string find_type_name(complex*);
 template<> SCISHARE std::string find_type_name(long double*);
 template<> SCISHARE std::string find_type_name(short*);
 template<> SCISHARE std::string find_type_name(unsigned short*);

src/Core/Datatypes/MatrixFwd.h

@@ -52,7 +52,7 @@ namespace Datatypes {
   class DenseMatrixGeneric;
 
   typedef DenseMatrixGeneric<double> DenseMatrix;
-  using ComplexDenseMatrix = DenseMatrixGeneric<SCIRun::Complex>;
+  using ComplexDenseMatrix = DenseMatrixGeneric<SCIRun::complex>;
 
   typedef SharedPointer<DenseMatrix> DenseMatrixHandle;
   typedef SharedPointer<const DenseMatrix> DenseMatrixConstHandle;

src/Modules/Basic/ReceiveComplexScalar.cc

@@ -38,8 +38,7 @@ using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun::Core::Algorithms;
 
 ReceiveComplexScalarModule::ReceiveComplexScalarModule()
-  : Module(ModuleLookupInfo("ReceiveComplexMatrix", "Math", "SCIRun"), false),
-  latestValue_(-1)
+  : Module(ModuleLookupInfo("ReceiveComplexMatrix", "Math", "SCIRun"), false)
 {
   INITIALIZE_PORT(Input);
 }

src/Modules/Basic/ReceiveComplexScalar.h

@@ -45,11 +45,7 @@ namespace SCIRun {
         virtual void execute();
         virtual void setStateDefaults() {}
 
-        Complex latestReceivedValue() const { return latestValue_; }
-
         INPUT_PORT(0, Input, ComplexDenseMatrix);
-      private:
-        Complex latestValue_;
       };
  }}}
 

src/Modules/Basic/SendComplexScalar.cc

@@ -49,7 +49,7 @@ void SendComplexScalarModule::execute()
   if (needToExecute())
   {
     ComplexDenseMatrix c(2,2);
-    c << Complex(1,2), Complex(3,4), Complex(-1,-2), Complex(-3,-4);
+    c << complex(1,2), complex(3,4), complex(-1,-2), complex(-3,-4);
     auto output(boost::make_shared<ComplexDenseMatrix>(c));
     sendOutput(Scalar, output);
   }

src/Modules/Basic/SendComplexScalar.h

@@ -47,7 +47,7 @@ namespace Basic {
 
     OUTPUT_PORT(0, Scalar, ComplexDenseMatrix);
   private:
-    Complex data_;
+    complex data_;
   };
 
 }}}