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

Remove Qt Depreciated Warnings Part 1 (#5448) 

* Qt::SkipEmptyParts and Qt::endl

* qSort -> std:sort

* remove default.profraw

* more qDebug endl -> Qt::endl

* more endl -> Qt::endl
parent fde64d83

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ object_script.*.Debug 
*.moc

ui_*.h

*html

*.profraw



# ignore all files created by squish coco

*csmes

isis/src/base/apps/appjit/PixelOffset.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ namespace Isis { 




    for(size_t iline = 0; iline < lines.size(); iline++) {

      fields = lines[iline].simplified().split(" ", QString::SkipEmptyParts);

      fields = lines[iline].simplified().split(" ", Qt::SkipEmptyParts);

      if(fields.count() != 3) {

        QString msg = "Three fields are required:  sample, line, and ephemeris time.";

        throw IException(IException::Io, msg, _FILEINFO_);

isis/src/base/apps/isisimport/isisimport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ namespace Isis { 
        stretchPairs->GetLine(line);  //assigns value to line

        line = line.simplified();



        for (QString value: line.split(QRegExp("[\\s,]"), QString::SkipEmptyParts)) {

        for (QString value: line.split(QRegExp("[\\s,]"), Qt::SkipEmptyParts)) {

          vectorStretchPairs.push_back(temp1);

          vectorStretchPairs.push_back(toDouble(value));

          temp1++;

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

+2 −2
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ namespace Isis { 
  int NumericalSortStrategy::apply(ResourceList &resources, 

                                   const ResourceList &globals) { 

    if ( "ascending" == m_order) {

      qSort(resources.begin(), resources.end(), SortAscending(m_sortKey));

      std::sort(resources.begin(), resources.end(), SortAscending(m_sortKey));

    }

    else {  // ("descending" == m_order) 

      qSort(resources.begin(), resources.end(), SortDescending(m_sortKey));

      std::sort(resources.begin(), resources.end(), SortDescending(m_sortKey));

    }

  

    //  Keeps the Resource by just running the counter

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

+3 −3
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ void IsisMain() { 
    globals->add("PARAMETERS", parameters);

    

    // Split by separate parameters

    QStringList parmlist = parameters.split("@", QString::SkipEmptyParts);

    QStringList parmlist = parameters.split("@", Qt::SkipEmptyParts);

    BOOST_FOREACH (QString parm, parmlist) {

      // Split values from keyword name

      QStringList keyval = parm.split(":", QString::SkipEmptyParts);

      QStringList keyval = parm.split(":", Qt::SkipEmptyParts);

      if ( keyval.size() != 2 ) {

        QString mess = "Ill-formed PARAMETERS (" + parm + ") - use form @key:val";

        throw IException(IException::User, mess, _FILEINFO_);
@@ -76,7 +76,7 @@ void IsisMain() { 


      // Now split multi string values and construct the Pvl keyword

      QString keyname = keyval[0];

      QStringList values =  keyval[1].split(",", QString::SkipEmptyParts);

      QStringList values =  keyval[1].split(",", Qt::SkipEmptyParts);

      PvlKeyword keyword(keyname);

      BOOST_FOREACH ( QString val, values) {

        keyword.addValue(val);