Commit 031890ad authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Merged from IPCE branch. Replaced QString::toAscii with... 

PROG: Merged from IPCE branch. Replaced QString::toAscii with QString::toLatin1 in Equalization class unitTest.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6935 41f8697f-d340-4b68-9986-7bafba869bb8
parent 911bdad0

isis/src/base/objs/Equalization/Equalization.h

+4 −2
Original line number Diff line number Diff line
@@ -138,7 +138,9 @@ namespace Isis { 


      void addHolds(QString holdListName);



      void calculateStatistics(double samplingPercent, int mincnt, bool wtopt,

      void calculateStatistics(double samplingPercent, 

                               int mincnt, 

                               bool wtopt,

                               LeastSquares::SolveMethod methodType);

      void recalculateStatistics(QString inStatsFileName);

      void importStatistics(QString instatsFileName);

isis/src/base/objs/Equalization/unitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) { 


  FileList toFileList(toList);

  for (int i = 0; i < toFileList.size(); i++) {

    remove(toFileList[i].expanded().toAscii());

    remove(toFileList[i].expanded().toLatin1());

  }