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

Remove Qt Depreciated Warnings Part 2 (#5449) 



* .width -> .horizontalAdvance

* remove fromStdVector and toStdVector

* QTime -> QElapsedTimer for elapsed()

* MidButton -> MiddleButton

* misc fixes

* compile error fixes

---------

Co-authored-by: default avatarKelvin Rodriguez <krodriguez@usgs.gov>
parent 1663b190

isis/src/base/apps/barscale/main.cpp

+5 −5
Original line number Diff line number Diff line
@@ -225,13 +225,13 @@ void IsisMain() { 
  int lblStrWidth;

  if (leftLimit > 0) {

    lblStr.setNum(leftLimit);

    lblStrWidth = metric.width(lblStr);

    lblStrWidth = metric.horizontalAdvance(lblStr);

    totalWidth = totalWidth + lblStrWidth / 2;

    cornerSample = cornerSample + lblStrWidth / 2;

    leftDisplayRect.setRect( ( cornerSample - lblStrWidth / 2), (textCtrLine - fontHeight / 2 - 2),

                            (lblStrWidth + 10), (fontHeight + 8) );

  }

  lblStrWidth = metric.width("0");

  lblStrWidth = metric.horizontalAdvance("0");

  ctrDisplayRect.setRect( (cornerSample + leftLimit * scaleUnit / resolution + .5 - lblStrWidth / 2),

                         (textCtrLine - fontHeight / 2 - 2), (lblStrWidth + 10), (fontHeight + 8) );
@@ -250,7 +250,7 @@ void IsisMain() { 
    }

  }

  lblStr = lblStr + " " + unitStr;

  lblStrWidth = metric.width(lblStr);

  lblStrWidth = metric.horizontalAdvance(lblStr);

  totalWidth = totalWidth + lblStrWidth + (textHt + 1) / 2 + 10;

  rightDisplayRect.setRect( (barWidth + cornerSample - lblStrWidth / 2),

                           (textCtrLine - fontHeight / 2 - 2),
@@ -431,11 +431,11 @@ void IsisMain() { 
  painter.setLayoutDirection(Qt::LeftToRight);

  if (leftLimit > 0) {

    lblStr.setNum(leftLimit);

    lblStrWidth = metric.width(lblStr);

    lblStrWidth = metric.horizontalAdvance(lblStr);

    painter.drawText(leftDisplayRect, lblStr);

  }

  lblStr.setNum(0);

  lblStrWidth = metric.width(lblStr);

  lblStrWidth = metric.horizontalAdvance(lblStr);

  painter.drawText(ctrDisplayRect, lblStr);

  lblStr.setNum(rightLimit);

  lblStr = lblStr + " " + unitStr;

isis/src/base/apps/isisminer/main.cpp

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <QString>

#include <QStringList>

#include <QTime>

#include <QElapsedTimer>



// boost library

#include <boost/foreach.hpp>
@@ -113,13 +114,14 @@ void IsisMain() { 
         << " (TimeIn:  " << stime.toString("hh:mm:ss.zzz") 

         << ")\n"

         << "Description: " << strategy->description() << "\n";

    stime.start();

    QElapsedTimer stimer;

    stimer.start();

    int n = strategy->apply(resources);

    unsigned int ntotal = strategy->totalProcessed();

    cout << n << " of " << ntotal << " processed in " 

         << strategy->type() << "::" << strategy->name() 

         << " (TimeOut: " << QTime::currentTime().toString("hh:mm:ss.zzz") << ")\n";

    cout << "ElapsedTime(s): " << stime.elapsed() / 1000  << "\n";

    cout << "ElapsedTime(s): " << stimer.elapsed() / 1000  << "\n";

  }



  // Get total elapded time

isis/src/base/apps/spiceinit/SpiceClient.cpp

+1 −3
Original line number Diff line number Diff line
@@ -644,9 +644,7 @@ namespace Isis { 
    QString encodedString = elementContents(pointingTag);



    QByteArray encodedArray;

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

      encodedArray.append(encodedString.data()[i]);

    }

    encodedArray.append(encodedString.toUtf8());



    QByteArray unencodedArray(QByteArray::fromHex(encodedArray));

isis/src/base/apps/spiceinit/spiceinit.cpp

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ namespace Isis { 
          vector<QString> userEnteredCks;

          ui.GetAsString("CK", userEnteredCks);

          // convert user entered std vector to QStringList and add to ckKernelList

          ckKernelList = QVector<QString>::fromStdVector(userEnteredCks).toList();

          ckKernelList = QVector<QString>(userEnteredCks.begin(),userEnteredCks.end()).toList();

        }

        else {// loop through cks found in the system
@@ -283,7 +283,7 @@ namespace Isis { 
      // NOTE: This is using GetAsString so that vars like $mgs can be used.

      vector<QString> kernels;

      ui.GetAsString(param, kernels);

      kernel.setKernels(QVector<QString>::fromStdVector(kernels).toList());

      kernel.setKernels(QVector<QString>(kernels.begin(),kernels.end()).toList());

    }

  }

isis/src/base/apps/trackextract/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ void createMosaicCube(QString inputName, QString outputName, QVector<QString> ba 
  ProcessByLine p;



  CubeAttributeInput inAtt = CubeAttributeInput();

  inAtt.setBands(bandsVector.toStdVector());

  inAtt.setBands(std::vector<QString>(bandsVector.begin(), bandsVector.end()));



  p.SetInputCube(inputName, inAtt);

  p.SetOutputCube("TO");