Unverified Commit 1a842603 authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

Remove Qt Deprecated Warnings Part 4 (#5458) 

* Final qt warnings

* revert ProgramLauncher changes.
parent a4bc28d4

isis/src/base/objs/Cube/CubeIoHandler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ find files of those names at the top level of this repository. **/ 
#include <QMutex>

#include <QPair>

#include <QRect>

#include <QTime>

#include <QElapsedTimer>



#include "Area3D.h"

#include "Brick.h"
@@ -1866,7 +1866,7 @@ namespace Isis { 
      CubeIoHandler * ioHandler, QList<Buffer *> buffersToWrite) {

    m_ioHandler = ioHandler;

    m_buffersToWrite = new QList<Buffer *>(buffersToWrite);

    m_timer = new QTime;

    m_timer = new QElapsedTimer;

    m_timer->start();



    m_ioHandler->m_writeThreadMutex->lock();

isis/src/base/objs/Cube/CubeIoHandler.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ find files of those names at the top level of this repository. **/ 


class QFile;

class QMutex;

class QTime;

class QElapsedTimer;

template <typename A> class QList;

template <typename A, typename B> class QMap;

template <typename A, typename B> struct QPair;
@@ -209,7 +209,7 @@ namespace Isis { 
          //! The buffers that need pushed into the IO handler; we own these

          QList<Buffer * > * m_buffersToWrite;

          //! Used to calculate the lifetime of an instance of this class

          QTime *m_timer;

          QElapsedTimer *m_timer;

      };

isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ find files of those names at the top level of this repository. **/ 
#include "IString.h"



using namespace std;



namespace Isis {

  /**

   * Executes the Isis program with the given arguments. This will handle logs,

isis/src/base/objs/StatCumProbDistDynCalc/StatCumProbDistDynCalc.cpp

+1 −2
Original line number Diff line number Diff line
@@ -462,8 +462,7 @@ namespace Isis { 


      // if there are now m_numberQuantiles observations, then sort them from smallest to greatest

      if (m_numberObservations == m_numberQuantiles) {

        qSort(m_observationValues.begin(),  m_observationValues.end(),  std::less<double>());

        std::sort(m_observationValues.begin(),  m_observationValues.end(),  qLess<double>());

        std::sort(m_observationValues.begin(),  m_observationValues.end(),  std::less<double>());

      }

    }

    else { // m_numberObservations >= m_numberQuantiles

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

+3 −3
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void IsisMain() { 
  qDebug() << "Type:         " << strat1.type();

  qDebug() << "Description:  " << strat1.description();



  qDebug() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" << endl;

  qDebug() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" << Qt::endl;



  qDebug() << "Testing Strategy(const PvlObject &def,const ResourceList &globals) constructor:";

  qDebug() << Qt::endl;
@@ -457,7 +457,7 @@ void IsisMain() { 
  qDebug() << "Number of resources processed (after discarding resource 0) = ";

  qDebug() << resourcesProcessed << Qt::endl;



  qDebug() << "Call setApplyToDiscarded:" <<endl;

  qDebug() << "Call setApplyToDiscarded:" <<Qt::endl;

  dstrat4.setApplyToDiscardedA();

  resourcesProcessed = dstrat4.applyToResourcesA(lstA,globals);

  qDebug() << "Number of resources processed (after discarding resource 0) = ";