Index: trunk/BNC/src/PPP_SSR_I/pppFilter.cpp =================================================================== --- trunk/BNC/src/PPP_SSR_I/pppFilter.cpp (revision 8203) +++ trunk/BNC/src/PPP_SSR_I/pppFilter.cpp (revision 8204) @@ -648,5 +648,5 @@ ++par->numEpo; LOG << "\n" << _time.datestr() << "_" << _time.timestr(3) - << " AMB " << par->prn.mid(0,3).toAscii().data() << " " + << " AMB " << par->prn.mid(0,3).toLatin1().data() << " " << setw(10) << setprecision(3) << par->xx << " +- " << setw(6) << setprecision(3) @@ -657,5 +657,5 @@ double aprTrp = delay_saast(M_PI/2.0); LOG << "\n" << _time.datestr() << "_" << _time.timestr(3) - << " TRP " << par->prn.mid(0,3).toAscii().data() + << " TRP " << par->prn.mid(0,3).toLatin1().data() << setw(7) << setprecision(3) << aprTrp << " " << setw(6) << setprecision(3) << showpos << par->xx << noshowpos @@ -757,14 +757,14 @@ if (iPhase == 1) { if (maxResGlo > 2.98 * OPT->_maxResL1) { - LOG << "Outlier Phase " << prnGlo.mid(0,3).toAscii().data() << ' ' << maxResGlo << endl; + LOG << "Outlier Phase " << prnGlo.mid(0,3).toLatin1().data() << ' ' << maxResGlo << endl; return prnGlo; } else if (maxResGPS > MAXRES_PHASE_GPS) { - LOG << "Outlier Phase " << prnGPS.mid(0,3).toAscii().data() << ' ' << maxResGPS << endl; + LOG << "Outlier Phase " << prnGPS.mid(0,3).toLatin1().data() << ' ' << maxResGPS << endl; return prnGPS; } } else if (iPhase == 0 && maxResGPS > 2.98 * OPT->_maxResC1) { - LOG << "Outlier Code " << prnGPS.mid(0,3).toAscii().data() << ' ' << maxResGPS << endl; + LOG << "Outlier Code " << prnGPS.mid(0,3).toLatin1().data() << ' ' << maxResGPS << endl; return prnGPS; } @@ -967,5 +967,5 @@ if (satData->obsIndex != 0 && useObs) { str << _time.datestr() << "_" << _time.timestr(3) - << " RES " << satData->prn.mid(0,3).toAscii().data() + << " RES " << satData->prn.mid(0,3).toLatin1().data() << (iPhase ? " L3 " : " P3 ") << setw(9) << setprecision(4) << vv(satData->obsIndex) << endl; @@ -1132,10 +1132,10 @@ LOG << "Neglected PRNs: "; if (!_outlierGPS.isEmpty()) { - LOG << _outlierGPS.last().mid(0,3).toAscii().data() << ' '; + LOG << _outlierGPS.last().mid(0,3).toLatin1().data() << ' '; } QStringListIterator itGlo(_outlierGlo); while (itGlo.hasNext()) { QString prn = itGlo.next(); - LOG << prn.mid(0,3).toAscii().data() << ' '; + LOG << prn.mid(0,3).toLatin1().data() << ' '; } LOG << endl; Index: trunk/BNC/src/RTCM/RTCM2Decoder.cpp =================================================================== --- trunk/BNC/src/RTCM/RTCM2Decoder.cpp (revision 8203) +++ trunk/BNC/src/RTCM/RTCM2Decoder.cpp (revision 8204) @@ -424,5 +424,5 @@ errmsg.push_back( - "missing eph for " + string(prn.toAscii().data()) + " , IODs " + "missing eph for " + string(prn.toLatin1().data()) + " , IODs " + missingIODstr.str()); } Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 8203) +++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 8204) @@ -824,5 +824,5 @@ else if ((type % 10) < 3) { emit(newMessage(QString("%1: Block %2 contain partial data! Ignored!") - .arg(_staID).arg(type).toAscii(), true)); + .arg(_staID).arg(type).toLatin1(), true)); } if (!syncf) { @@ -1482,7 +1482,7 @@ * else. */ if ((id >= 1057 && id <= 1068) || (id >= 1240 && id <= 1270)) { - if (!_coDecoders.contains(_staID.toAscii())) - _coDecoders[_staID.toAscii()] = new RTCM3coDecoder(_staID); - RTCM3coDecoder* coDecoder = _coDecoders[_staID.toAscii()]; + if (!_coDecoders.contains(_staID.toLatin1())) + _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID); + RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()]; if (coDecoder->Decode(reinterpret_cast(_Message), _BlockSize, errmsg) == success) { @@ -1500,5 +1500,5 @@ emit(newMessage( QString("%1: Block %2 contain partial data! Ignored!") - .arg(_staID).arg(id).toAscii(), true)); + .arg(_staID).arg(id).toLatin1(), true)); break; /* no use decoding partial data ATM, remove break when data can be used */ case 1002: @@ -1511,5 +1511,5 @@ emit(newMessage( QString("%1: Block %2 contain partial data! Ignored!") - .arg(_staID).arg(id).toAscii(), true)); + .arg(_staID).arg(id).toLatin1(), true)); break; /* no use decoding partial data ATM, remove break when data can be used */ case 1010: Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 8203) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 8204) @@ -146,8 +146,8 @@ delete _out; if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) { - _out = new ofstream( _fileName.toAscii().data(), ios_base::out | ios_base::app ); + _out = new ofstream( _fileName.toLatin1().data(), ios_base::out | ios_base::app ); } else { - _out = new ofstream( _fileName.toAscii().data() ); + _out = new ofstream( _fileName.toLatin1().data() ); } } @@ -560,5 +560,5 @@ if (alreadySet && different) { - emit newMessage("RTCM3coDecoder: Provider Changed: " + _staID.toAscii(), true); + emit newMessage("RTCM3coDecoder: Provider Changed: " + _staID.toLatin1(), true); emit providerIDChanged(_staID); } Index: trunk/BNC/src/bncantex.cpp =================================================================== --- trunk/BNC/src/bncantex.cpp (revision 8203) +++ trunk/BNC/src/bncantex.cpp (revision 8204) @@ -75,5 +75,5 @@ itAnt.next(); t_antMap* map = itAnt.value(); - cout << map->antName.toAscii().data() << endl; + cout << map->antName.toLatin1().data() << endl; cout << " " << map->zen1 << " " << map->zen2 << " " << map->dZen << endl; QMapIterator itFrq(map->frqMap); Index: trunk/BNC/src/bncclockrinex.cpp =================================================================== --- trunk/BNC/src/bncclockrinex.cpp (revision 8203) +++ trunk/BNC/src/bncclockrinex.cpp (revision 8204) @@ -48,8 +48,8 @@ double sec = fmod(GPSweeks, 60.0); - _out << "AS " << prn.toAscii().data() - << datTim.toString(" yyyy MM dd hh mm").toAscii().data() + _out << "AS " << prn.toLatin1().data() + << datTim.toString(" yyyy MM dd hh mm").toLatin1().data() << fixed << setw(10) << setprecision(6) << sec - << " 1 " << fortranFormat(sp3Clk, 19, 12).toAscii().data() << endl; + << " 1 " << fortranFormat(sp3Clk, 19, 12).toLatin1().data() << endl; return success; @@ -69,5 +69,5 @@ _out << "BNC v" << BNCVERSION << " " - << datTim.toString("yyyyMMdd hhmmss").leftJustified(20, ' ', true).toAscii().data() + << datTim.toString("yyyyMMdd hhmmss").leftJustified(20, ' ', true).toLatin1().data() << "PGM / RUN BY / DATE" << endl; Index: trunk/BNC/src/bncfigure.cpp =================================================================== --- trunk/BNC/src/bncfigure.cpp (revision 8203) +++ trunk/BNC/src/bncfigure.cpp (revision 8204) @@ -89,5 +89,5 @@ if (hlp.size() <= 1) continue; QUrl url(hlp[0]); - QByteArray staID = url.path().mid(1).toAscii(); + QByteArray staID = url.path().mid(1).toLatin1(); _bytes[staID] = new sumAndMean(); } Index: trunk/BNC/src/bncfigurelate.cpp =================================================================== --- trunk/BNC/src/bncfigurelate.cpp (revision 8203) +++ trunk/BNC/src/bncfigurelate.cpp (revision 8204) @@ -76,5 +76,5 @@ if (hlp.size() <= 1) continue; QUrl url(hlp[0]); - QByteArray staID = url.path().mid(1).toAscii(); + QByteArray staID = url.path().mid(1).toLatin1(); _latency[staID] = 0.0; } Index: trunk/BNC/src/bncnetquerys.cpp =================================================================== --- trunk/BNC/src/bncnetquerys.cpp (revision 8203) +++ trunk/BNC/src/bncnetquerys.cpp (revision 8204) @@ -79,5 +79,5 @@ QString hlp; QStringList hlpL; - hlp = _url.host().toAscii().replace("-"," "); + hlp = _url.host().toLatin1().replace("-"," "); hlpL = hlp.split(" "); @@ -191,5 +191,5 @@ _serialPort = 0; _status = error; - emit newMessage(_url.path().toAscii().replace(0,1,"") + ": Cannot open serial port " + _portString.toAscii(), true); + emit newMessage(_url.path().toLatin1().replace(0,1,"") + ": Cannot open serial port " + _portString.toLatin1(), true); return; } Index: trunk/BNC/src/bncnetqueryudp.cpp =================================================================== --- trunk/BNC/src/bncnetqueryudp.cpp (revision 8203) +++ trunk/BNC/src/bncnetqueryudp.cpp (revision 8204) @@ -124,15 +124,15 @@ // Send Request // ------------ - QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii()); - QString passW = QUrl::fromPercentEncoding(_url.password().toAscii()); + QString uName = QUrl::fromPercentEncoding(_url.userName().toLatin1()); + QString passW = QUrl::fromPercentEncoding(_url.password().toLatin1()); QByteArray userAndPwd; if(!uName.isEmpty() || !passW.isEmpty()) { - userAndPwd = "Authorization: Basic " + (uName.toAscii() + ":" + - passW.toAscii()).toBase64() + "\r\n"; + userAndPwd = "Authorization: Basic " + (uName.toLatin1() + ":" + + passW.toLatin1()).toBase64() + "\r\n"; } - QByteArray reqStr = "GET " + _url.path().toAscii() + " HTTP/1.1\r\n" - + "Host: " + _url.host().toAscii() + "\r\n" + QByteArray reqStr = "GET " + _url.path().toLatin1() + " HTTP/1.1\r\n" + + "Host: " + _url.host().toLatin1() + "\r\n" + "Ntrip-Version: Ntrip/2.0\r\n" + "User-Agent: NTRIP BNC/" BNCVERSION " (" BNC_OS ")\r\n"; Index: trunk/BNC/src/bncnetqueryv0.cpp =================================================================== --- trunk/BNC/src/bncnetqueryv0.cpp (revision 8203) +++ trunk/BNC/src/bncnetqueryv0.cpp (revision 8204) @@ -67,5 +67,5 @@ _socket = 0; _status = error; - emit newMessage(_url.path().toAscii() + " read timeout", true); + emit newMessage(_url.path().toLatin1() + " read timeout", true); return; } @@ -102,5 +102,5 @@ _socket = 0; _status = error; - emit(newMessage(_url.path().toAscii().replace(0,1,"") + emit(newMessage(_url.path().toLatin1().replace(0,1,"") + ": Connect timeout, reconnecting", true)); return; @@ -115,5 +115,5 @@ _socket = 0; _status = error; - emit newMessage(_url.path().toAscii().replace(0,1,"") + emit newMessage(_url.path().toLatin1().replace(0,1,"") + ": Read timeout", true); return; Index: trunk/BNC/src/bncoutf.cpp =================================================================== --- trunk/BNC/src/bncoutf.cpp (revision 8203) +++ trunk/BNC/src/bncoutf.cpp (revision 8204) @@ -181,8 +181,8 @@ _out.setf(ios::showpoint | ios::fixed); if (_append && QFile::exists(_fName)) { - _out.open(_fName.toAscii().data(), ios::out | ios::app); + _out.open(_fName.toLatin1().data(), ios::out | ios::app); } else { - _out.open(_fName.toAscii().data()); + _out.open(_fName.toLatin1().data()); writeHeader(datTim); } @@ -199,5 +199,5 @@ t_irc bncoutf::write(int GPSweek, double GPSweeks, const QString& str) { reopen(GPSweek, GPSweeks); - _out << str.toAscii().data(); + _out << str.toLatin1().data(); _out.flush(); return success; Index: trunk/BNC/src/bncrawfile.cpp =================================================================== --- trunk/BNC/src/bncrawfile.cpp (revision 8203) +++ trunk/BNC/src/bncrawfile.cpp (revision 8204) @@ -115,5 +115,5 @@ .arg(QString(format)) .arg(data.size()); - _outFile->write(chunkHeader.toAscii()); + _outFile->write(chunkHeader.toLatin1()); _outFile->write(data); _outFile->flush(); @@ -138,6 +138,6 @@ BNC_CORE->setDateAndTimeGPS(QDateTime(QDateTime::fromString(lst.value(0), Qt::ISODate))); - _staID = lst.value(1).toAscii(); - _format = lst.value(2).toAscii(); + _staID = lst.value(1).toLatin1(); + _format = lst.value(2).toLatin1(); int nBytes = lst.value(3).toInt(); Index: trunk/BNC/src/bncsp3.cpp =================================================================== --- trunk/BNC/src/bncsp3.cpp (revision 8203) +++ trunk/BNC/src/bncsp3.cpp (revision 8204) @@ -32,5 +32,5 @@ _prevEpoch = 0; - _stream.open(fileName.toAscii().data()); + _stream.open(fileName.toLatin1().data()); if (!_stream.good()) { throw "t_sp3File: cannot open file " + fileName; @@ -87,5 +87,5 @@ } - _out << "P" << prn.toAscii().data() + _out << "P" << prn.toLatin1().data() << setw(14) << setprecision(6) << xCoM(1) / 1000.0 << setw(14) << setprecision(6) << xCoM(2) / 1000.0 @@ -126,5 +126,5 @@ } - _out << "#aP" << datTim.toString("yyyy MM dd hh mm").toAscii().data() + _out << "#aP" << datTim.toString("yyyy MM dd hh mm").toLatin1().data() << setw(12) << setprecision(8) << sec << " " << setw(7) << numEpo << " ORBIT IGS14 HLM IGS" << endl; Index: trunk/BNC/src/combination/bnccomb.cpp =================================================================== --- trunk/BNC/src/combination/bnccomb.cpp (revision 8203) +++ trunk/BNC/src/combination/bnccomb.cpp (revision 8204) @@ -366,5 +366,5 @@ // -------------------- if (_resTime.valid() && clkCorr._time <= _resTime) { - emit newMessage("bncComb: old correction: " + acName.toAscii() + " " + prn.mid(0,3).toAscii(), true); + emit newMessage("bncComb: old correction: " + acName.toLatin1() + " " + prn.mid(0,3).toLatin1(), true); continue; } @@ -401,5 +401,5 @@ t_eph* ephPrev = _ephUser.ephPrev(prn); if (ephLast == 0) { - emit newMessage("bncComb: eph not found " + prn.mid(0,3).toAscii(), true); + emit newMessage("bncComb: eph not found " + prn.mid(0,3).toLatin1(), true); delete newCorr; continue; @@ -414,6 +414,6 @@ } else { - emit newMessage("bncComb: eph not found " + prn.mid(0,3).toAscii() + - QString(" %1").arg(newCorr->_iod).toAscii(), true); + emit newMessage("bncComb: eph not found " + prn.mid(0,3).toLatin1() + + QString(" %1").arg(newCorr->_iod).toLatin1(), true); delete newCorr; continue; @@ -469,5 +469,5 @@ + QString(" %1 -> %2 %3").arg(corr->_iod,3).arg(lastEph->IOD(),3).arg(dC*t_CST::c, 8, 'f', 4); - emit newMessage(msg.toAscii(), false); + emit newMessage(msg.toLatin1(), false); corr->_iod = lastEph->IOD(); @@ -507,5 +507,5 @@ } } - out << AC->name.toAscii().data() << ": " << AC->numObs << endl; + out << AC->name.toLatin1().data() << ": " << AC->numObs << endl; } @@ -531,6 +531,6 @@ if (AC->numObs > 0) { out << "Switching Master AC " - << _masterOrbitAC.toAscii().data() << " --> " - << AC->name.toAscii().data() << " " + << _masterOrbitAC.toLatin1().data() << " --> " + << AC->name.toLatin1().data() << " " << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << endl; @@ -752,5 +752,5 @@ if (_antex->satCoMcorrection(corr->_prn, Mjd, xc.Rows(1,3), dx) != success) { dx = 0; - _log += "antenna not found " + corr->_prn.mid(0,3).toAscii() + '\n'; + _log += "antenna not found " + corr->_prn.mid(0,3).toLatin1() + '\n'; } } @@ -777,5 +777,5 @@ " %10.5f INTERNAL", messageType, updateInt, _resTime.gpsw(), _resTime.gpssec(), - corr->_prn.mid(0,3).toAscii().data(), + corr->_prn.mid(0,3).toLatin1().data(), corr->_iod, corr->_dClkResult * t_CST::c, @@ -800,5 +800,5 @@ vector errmsg; - _rtnetDecoder->Decode(outLines.toAscii().data(), outLines.length(), errmsg); + _rtnetDecoder->Decode(outLines.toLatin1().data(), outLines.length(), errmsg); // Send new Corrections to PPP etc. @@ -1169,6 +1169,6 @@ << _resTime.timestr().c_str() << " " << "Orbit Outlier: " - << corr->_acName.toAscii().data() << " " - << prn.mid(0,3).toAscii().data() << " " + << corr->_acName.toLatin1().data() << " " + << prn.mid(0,3).toLatin1().data() << " " << corr->_iod << " " << norm << endl; @@ -1203,5 +1203,5 @@ if (AC->mountPoint == mountPoint) { acName = AC->name; - out << "Provider ID changed: AC " << AC->name.toAscii().data() << " " + out << "Provider ID changed: AC " << AC->name.toLatin1().data() << " " << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << endl; Index: trunk/BNC/src/ephemeris.cpp =================================================================== --- trunk/BNC/src/ephemeris.cpp (revision 8203) +++ trunk/BNC/src/ephemeris.cpp (revision 8204) @@ -176,5 +176,5 @@ if ( iLine == 0 ) { - QTextStream in(line.left(pos[1]).toAscii()); + QTextStream in(line.left(pos[1]).toLatin1()); int year, month, day, hour, min; double sec; @@ -512,5 +512,5 @@ if ( iLine == 0 ) { - QTextStream in(line.left(pos[1]).toAscii()); + QTextStream in(line.left(pos[1]).toLatin1()); int year, month, day, hour, min; @@ -771,5 +771,5 @@ if ( iLine == 0 ) { - QTextStream in(line.left(pos[1]).toAscii()); + QTextStream in(line.left(pos[1]).toLatin1()); QString n; in >> prnStr; @@ -1159,5 +1159,5 @@ if ( iLine == 0 ) { - QTextStream in(line.left(pos[1]).toAscii()); + QTextStream in(line.left(pos[1]).toLatin1()); int year, month, day, hour, min; @@ -1353,5 +1353,5 @@ if ( iLine == 0 ) { - QTextStream in(line.left(pos[1]).toAscii()); + QTextStream in(line.left(pos[1]).toLatin1()); int year, month, day, hour, min; Index: trunk/BNC/src/latencychecker.cpp =================================================================== --- trunk/BNC/src/latencychecker.cpp (revision 8203) +++ trunk/BNC/src/latencychecker.cpp (revision 8204) @@ -178,7 +178,7 @@ _begTimeOut = _endDateTimeOut.toUTC().time().toString("hh:mm:ss"); emit(newMessage((_staID + ": Failure threshold exceeded, outage since " - + _begDateOut + " " + _begTimeOut + " UTC").toAscii(), true)); + + _begDateOut + " " + _begTimeOut + " UTC").toLatin1(), true)); callScript(("Begin_Outage " - + _begDateOut + " " + _begTimeOut + " UTC").toAscii()); + + _begDateOut + " " + _begTimeOut + " UTC").toLatin1()); _decodeStop.setDate(QDate()); _decodeStop.setTime(QTime()); @@ -257,7 +257,7 @@ _begTimeCorr = _endDateTimeCorr.toUTC().time().toString("hh:mm:ss"); emit(newMessage((_staID + ": Failure threshold exceeded, corrupted since " - + _begDateCorr + " " + _begTimeCorr + " UTC").toAscii(), true)); + + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1(), true)); callScript(("Begin_Corrupted " - + _begDateCorr + " " + _begTimeCorr + " UTC").toAscii()); + + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1()); _secSucc = 0; _numSucc = 0; @@ -277,8 +277,8 @@ _endTimeCorr = _begDateTimeCorr.toUTC().time().toString("hh:mm:ss"); emit(newMessage((_staID + ": Recovery threshold exceeded, corruption ended " - + _endDateCorr + " " + _endTimeCorr + " UTC").toAscii(), true)); + + _endDateCorr + " " + _endTimeCorr + " UTC").toLatin1(), true)); callScript(("End_Corrupted " + _endDateCorr + " " + _endTimeCorr + " UTC Begin was " - + _begDateCorr + " " + _begTimeCorr + " UTC").toAscii()); + + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1()); _decodeStartCorr.setDate(QDate()); _decodeStartCorr.setTime(QTime()); @@ -305,8 +305,8 @@ _endTimeOut = _begDateTimeOut.toUTC().time().toString("hh:mm:ss"); emit(newMessage((_staID + ": Recovery threshold exceeded, outage ended " - + _endDateOut + " " + _endTimeOut + " UTC").toAscii(), true)); + + _endDateOut + " " + _endTimeOut + " UTC").toLatin1(), true)); callScript(("End_Outage " + _endDateOut + " " + _endTimeOut + " UTC Begin was " - + _begDateOut + " " + _begTimeOut + " UTC").toAscii()); + + _begDateOut + " " + _begTimeOut + " UTC").toLatin1()); _decodeStart.setDate(QDate()); _decodeStart.setTime(QTime()); @@ -341,5 +341,5 @@ .arg(l._numLat) .arg(l._numGaps) - .toAscii(), true) ); + .toLatin1(), true) ); } } else { @@ -353,5 +353,5 @@ .arg(int((sqrt((l._sumLatQ - l._sumLat * l._sumLat / l._numLat)/l._numLat))*100)/100.) .arg(l._numLat) - .toAscii(), true) ); + .toLatin1(), true) ); } } @@ -466,5 +466,5 @@ .arg(l._numGaps); if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) { - emit(newMessage(QString(_staID + late ).toAscii(), true) ); + emit(newMessage(QString(_staID + late ).toLatin1(), true) ); } } @@ -478,5 +478,5 @@ .arg(l._numLat); if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) { - emit(newMessage(QString(_staID + late ).toAscii(), true) ); + emit(newMessage(QString(_staID + late ).toLatin1(), true) ); } } Index: trunk/BNC/src/orbComp/sp3Comp.cpp =================================================================== --- trunk/BNC/src/orbComp/sp3Comp.cpp (revision 8203) +++ trunk/BNC/src/orbComp/sp3Comp.cpp (revision 8204) @@ -423,5 +423,5 @@ QStringListIterator it(_excludeSats); while (it.hasNext()) { - string prnStr = it.next().toAscii().data(); + string prnStr = it.next().toLatin1().data(); if (prnStr == prn.toString() || prnStr == prn.toString().substr(0,1)) { return true; Index: trunk/BNC/src/pppModel.cpp =================================================================== --- trunk/BNC/src/pppModel.cpp (revision 8203) +++ trunk/BNC/src/pppModel.cpp (revision 8204) @@ -295,5 +295,5 @@ line = line.trimmed(); - QTextStream inLine(line.toAscii(), QIODevice::ReadOnly); + QTextStream inLine(line.toLatin1(), QIODevice::ReadOnly); switch (row) { Index: trunk/BNC/src/pppRun.cpp =================================================================== --- trunk/BNC/src/pppRun.cpp (revision 8203) +++ trunk/BNC/src/pppRun.cpp (revision 8204) @@ -375,6 +375,6 @@ _nmeaFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(), ggaStr); } - emit newNMEAstr(staID, rmcStr.toAscii()); - emit newNMEAstr(staID, ggaStr.toAscii()); + emit newNMEAstr(staID, rmcStr.toLatin1()); + emit newNMEAstr(staID, ggaStr.toLatin1()); if (_snxtroFile && output._epoTime.valid()) { _snxtroFile->write(staID, int(output._epoTime.gpsw()), output._epoTime.gpssec(), @@ -676,5 +676,5 @@ unsigned char XOR = 0; for (int ii = 0; ii < nmStr.length(); ii++) { - XOR ^= (unsigned char) nmStr[ii].toAscii(); + XOR ^= (unsigned char) nmStr[ii].toLatin1(); } @@ -692,5 +692,5 @@ QString msg = "pppRun " + QString(_opt->_roverName.c_str()) + ": Provider Changed: " + mountPoint; - emit newMessage(msg.toAscii(), true); + emit newMessage(msg.toLatin1(), true); _pppClient->reset(); Index: trunk/BNC/src/rinex/corrfile.cpp =================================================================== --- trunk/BNC/src/rinex/corrfile.cpp (revision 8203) +++ trunk/BNC/src/rinex/corrfile.cpp (revision 8204) @@ -50,5 +50,5 @@ t_corrFile::t_corrFile(QString fileName) { expandEnvVar(fileName); - _stream.open(fileName.toAscii().data()); + _stream.open(fileName.toLatin1().data()); } Index: trunk/BNC/src/rinex/reqcanalyze.cpp =================================================================== --- trunk/BNC/src/rinex/reqcanalyze.cpp (revision 8203) +++ trunk/BNC/src/rinex/reqcanalyze.cpp (revision 8204) @@ -157,5 +157,5 @@ QStringList input = signalsOpt.at(ii).split(QRegExp("[:&]"), QString::SkipEmptyParts); if (input.size() > 1 && input[0].length() == 1) { - char system = input[0].toAscii().constData()[0]; + char system = input[0].toLatin1().constData()[0]; QStringList sysValid = _defaultSignalTypes.filter(QString(system)); QStringList defaultSignals = sysValid.at(0).split(QRegExp("[:&]")); @@ -400,7 +400,7 @@ if (_signalTypes.find(sys) != _signalTypes.end()) { frqType1.push_back(sys); - frqType1.push_back(_signalTypes[sys][0][0].toAscii()); + frqType1.push_back(_signalTypes[sys][0][0].toLatin1()); frqType2.push_back(sys); - frqType2.push_back(_signalTypes[sys][1][0].toAscii()); + frqType2.push_back(_signalTypes[sys][1][0].toLatin1()); if (frqObs->_rnxType2ch[0] == frqType1[1]) { fA = t_frequency::toInt(frqType1); @@ -612,5 +612,5 @@ if (BNC_CORE->GUIenabled()) { QFileInfo fileInfo(obsFile->fileName()); - QByteArray title = fileInfo.fileName().toAscii(); + QByteArray title = fileInfo.fileName().toLatin1(); emit dspSkyPlot(obsFile->fileName(), mp1Title, dataMP1, mp2Title, dataMP2, "Meters", 2.0); emit dspSkyPlot(obsFile->fileName(), sn1Title, dataSNR1, sn2Title, dataSNR2, "dbHz", 54.0); @@ -725,6 +725,6 @@ } - char frqChar1 = _signalTypes[prn.system()][0][0].toAscii(); - char frqChar2 = _signalTypes[prn.system()][1][0].toAscii(); + char frqChar1 = _signalTypes[prn.system()][0][0].toLatin1(); + char frqChar2 = _signalTypes[prn.system()][1][0].toLatin1(); QString frqType1; Index: trunk/BNC/src/rinex/reqcedit.cpp =================================================================== --- trunk/BNC/src/rinex/reqcedit.cpp (revision 8203) +++ trunk/BNC/src/rinex/reqcedit.cpp (revision 8204) @@ -70,6 +70,6 @@ } _samplingRate = settings.value("reqcSampling").toInt(); - _begTime = bncTime(settings.value("reqcStartDateTime").toString().toAscii().data()); - _endTime = bncTime(settings.value("reqcEndDateTime").toString().toAscii().data()); + _begTime = bncTime(settings.value("reqcStartDateTime").toString().toLatin1().data()); + _endTime = bncTime(settings.value("reqcEndDateTime").toString().toLatin1().data()); } @@ -183,5 +183,5 @@ delete rnxObsFile; if (log) { - *log << "Error in rnxObsFile " << filePath.toAscii().data() << endl; + *log << "Error in rnxObsFile " << filePath.toLatin1().data() << endl; } } @@ -196,5 +196,5 @@ catch (...) { if (log) { - *log << "Error in rnxObsFile " << fileName.toAscii().data() << endl; + *log << "Error in rnxObsFile " << fileName.toLatin1().data() << endl; } } @@ -668,5 +668,5 @@ for(int ii = 0; ii < obsFile->numSys(); ii++) { - char sys = systems[ii].toAscii(); + char sys = systems[ii].toLatin1(); txtMap.insert(commentKey, comment); QMap signalPriorityMap; @@ -675,5 +675,5 @@ for (int jj = 0; jj < types.size(); jj++) { QString inType = types[jj]; - char band = inType[1].toAscii(); + char band = inType[1].toLatin1(); for (int ii = 0; ii < preferredAttribListSys.size(); ii++) { QString preferredAttrib; Index: trunk/BNC/src/rinex/rnxnavfile.cpp =================================================================== --- trunk/BNC/src/rinex/rnxnavfile.cpp (revision 8203) +++ trunk/BNC/src/rinex/rnxnavfile.cpp (revision 8204) @@ -74,5 +74,5 @@ } else if (key == "RINEX VERSION / TYPE") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _version; if (value.indexOf("GLONASS") != -1) { Index: trunk/BNC/src/rinex/rnxobsfile.cpp =================================================================== --- trunk/BNC/src/rinex/rnxobsfile.cpp (revision 8203) +++ trunk/BNC/src/rinex/rnxobsfile.cpp (revision 8204) @@ -92,5 +92,5 @@ } else if (key == "RINEX VERSION / TYPE") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _version; } @@ -118,5 +118,5 @@ } else if (key == "INTERVAL") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _interval; } @@ -125,5 +125,5 @@ } else if (key == "WAVELENGTH FACT L1/2") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); int wlFactL1 = 0; int wlFactL2 = 0; @@ -149,17 +149,17 @@ } else if (key == "APPROX POSITION XYZ") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _xyz[0] >> _xyz[1] >> _xyz[2]; } else if (key == "ANTENNA: DELTA H/E/N") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _antNEU[2] >> _antNEU[1] >> _antNEU[0]; } else if (key == "ANTENNA: DELTA X/Y/Z") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _antXYZ[0] >> _antXYZ[1] >> _antXYZ[2]; } else if (key == "ANTENNA: B.SIGHT XYZ") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); in >> _antBSG[0] >> _antBSG[1] >> _antBSG[2]; } @@ -168,8 +168,8 @@ _version = defaultRnxObsVersion2; } - QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly); + QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly); int nTypes; *in >> nTypes; - char sys0 = _usedSystems[0].toAscii(); + char sys0 = _usedSystems[0].toLatin1(); _obsTypes[sys0].clear(); for (int ii = 0; ii < nTypes; ii++) { @@ -177,5 +177,5 @@ line = stream->readLine(); ++numLines; delete in; - in = new QTextStream(line.left(60).toAscii(), QIODevice::ReadOnly); + in = new QTextStream(line.left(60).toLatin1(), QIODevice::ReadOnly); } QString hlp; @@ -184,5 +184,5 @@ } for (int ii = 1; ii < _usedSystems.length(); ii++) { - char sysI = _usedSystems[ii].toAscii(); + char sysI = _usedSystems[ii].toLatin1(); _obsTypes[sysI] = _obsTypes[sys0]; } @@ -192,5 +192,5 @@ _version = defaultRnxObsVersion3; } - QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly); + QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly); char sys; int nTypes; @@ -201,5 +201,5 @@ line = stream->readLine(); ++numLines; delete in; - in = new QTextStream(line.toAscii(), QIODevice::ReadOnly); + in = new QTextStream(line.toLatin1(), QIODevice::ReadOnly); } QString hlp; @@ -213,5 +213,5 @@ } else if (key == "TIME OF FIRST OBS") { - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); int year, month, day, hour, min; double sec; @@ -220,5 +220,5 @@ } else if (key == "SYS / PHASE SHIFT"){ - QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly); + QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly); char sys; QString obstype; @@ -233,5 +233,5 @@ line = stream->readLine(); ++numLines; delete in; - in = new QTextStream(line.left(60).toAscii(), QIODevice::ReadOnly); + in = new QTextStream(line.left(60).toLatin1(), QIODevice::ReadOnly); } *in >> sat; @@ -243,5 +243,5 @@ } else if (key == "GLONASS COD/PHS/BIS"){ - QTextStream in(value.toAscii(), QIODevice::ReadOnly); + QTextStream in(value.toLatin1(), QIODevice::ReadOnly); for (int ii = 0; ii < 4; ii++) { QString type; @@ -253,5 +253,5 @@ } else if (key == "GLONASS SLOT / FRQ #") { - QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly); + QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly); int nSlots = 0; *in >> nSlots; @@ -260,5 +260,5 @@ line = stream->readLine(); ++numLines; delete in; - in = new QTextStream(line.left(60).toAscii(), QIODevice::ReadOnly); + in = new QTextStream(line.left(60).toLatin1(), QIODevice::ReadOnly); } QString sat; @@ -457,5 +457,5 @@ QString type = header.obsType(sys, iType, _version); for (int jSys = 0; jSys < _usedSystems.length(); jSys++) { - char thisSys = _usedSystems[jSys].toAscii(); + char thisSys = _usedSystems[jSys].toLatin1(); if (!_obsTypes[thisSys].contains(type)) { _obsTypes[thisSys].push_back(type); @@ -473,5 +473,5 @@ if (hlp.size() == 2 && hlp[0].length() == 1) { if (_version >= 3.0) { - char sys = hlp[0][0].toAscii(); + char sys = hlp[0][0].toLatin1(); QString type = t_rnxObsFile::type2to3(sys, hlp[1]); if (!_obsTypes[sys].contains(type)) { @@ -481,5 +481,5 @@ else { for (int iSys = 0; iSys < _usedSystems.length(); iSys++) { - char sys = _usedSystems[iSys].toAscii(); + char sys = _usedSystems[iSys].toLatin1(); QString type = t_rnxObsFile::type3to2(sys, hlp[1]); if (!_obsTypes[sys].contains(type)) { @@ -492,5 +492,5 @@ else { for (int iSys = 0; iSys < _usedSystems.length(); iSys++) { - char sys = _usedSystems[iSys].toAscii(); + char sys = _usedSystems[iSys].toLatin1(); QString type = _version >= 3.0 ? t_rnxObsFile::type2to3(sys, useObsTypes->at(iType)) : t_rnxObsFile::type3to2(sys, useObsTypes->at(iType)); @@ -936,5 +936,5 @@ QStringList strList; if (_version < 3.0) { - char sys0 = _usedSystems[0].toAscii(); + char sys0 = _usedSystems[0].toLatin1(); QString hlp; QTextStream(&hlp) << QString("%1").arg(_obsTypes[sys0].size(), 6); @@ -1131,5 +1131,5 @@ } - QTextStream in(line.mid(1).toAscii(), QIODevice::ReadOnly); + QTextStream in(line.mid(1).toLatin1(), QIODevice::ReadOnly); // Epoch Time @@ -1151,5 +1151,5 @@ for (int iSat = 0; iSat < numSat; iSat++) { line = _stream->readLine(); - t_prn prn; prn.set(line.left(3).toAscii().data()); + t_prn prn; prn.set(line.left(3).toLatin1().data()); _currEpo.rnxSat[iSat].prn = prn; char sys = prn.system(); @@ -1202,5 +1202,5 @@ } - QTextStream in(line.toAscii(), QIODevice::ReadOnly); + QTextStream in(line.toLatin1(), QIODevice::ReadOnly); // Epoch Time @@ -1233,5 +1233,5 @@ } - char sys = line.toAscii()[pos]; + char sys = line.toLatin1()[pos]; if (sys == ' ') { sys = 'G'; @@ -1512,5 +1512,5 @@ void t_rnxObsFile::setObsFromRnx(const t_rnxObsFile* rnxObsFile, const t_rnxObsFile::t_rnxEpo* epo, const t_rnxObsFile::t_rnxSat& rnxSat, t_satObs& obs) { - obs._staID = rnxObsFile->markerName().toAscii().constData(); + obs._staID = rnxObsFile->markerName().toLatin1().constData(); obs._prn = rnxSat.prn; obs._time = epo->tt; @@ -1539,5 +1539,5 @@ const t_rnxObs& rnxObs = rnxSat.obs[type]; if (rnxObs.value != 0.0) { - string type2ch(typeV3.mid(1).toAscii().data()); + string type2ch(typeV3.mid(1).toLatin1().data()); t_frqObs* frqObs = 0; @@ -1554,5 +1554,5 @@ } - switch( typeV3.toAscii().data()[0] ) { + switch( typeV3.toLatin1().data()[0] ) { case 'C': frqObs->_codeValid = true; Index: trunk/BNC/src/serial/win_qextserialport.cpp =================================================================== --- trunk/BNC/src/serial/win_qextserialport.cpp (revision 8203) +++ trunk/BNC/src/serial/win_qextserialport.cpp (revision 8204) @@ -151,5 +151,5 @@ if (!isOpen()) { /*open the port*/ - Win_Handle=CreateFileA(port.toAscii(), GENERIC_READ|GENERIC_WRITE, + Win_Handle=CreateFileA(port.toLatin1(), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (Win_Handle!=INVALID_HANDLE_VALUE) { Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp =================================================================== --- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (revision 8203) +++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (revision 8204) @@ -280,5 +280,5 @@ // Read first line (with epoch time) // --------------------------------- - QTextStream in(lines[0].toAscii()); + QTextStream in(lines[0].toLatin1()); QString hlp; int year, month, day, hour, min; @@ -291,5 +291,5 @@ "bncRtnetUploadCaster: decode " + QByteArray(epoTime.datestr().c_str()) + " " + QByteArray(epoTime.timestr().c_str()) + " " - + _casterID.toAscii(), false)); + + _casterID.toLatin1(), false)); struct ClockOrbit co; @@ -369,5 +369,5 @@ t_prn prn; - QTextStream in(lines[ii].toAscii()); + QTextStream in(lines[ii].toLatin1()); in >> key; @@ -401,5 +401,5 @@ } // satellite specific parameters - char sys = key.mid(0, 1).at(0).toAscii(); + char sys = key.mid(0, 1).at(0).toLatin1(); int number = key.mid(1, 2).toInt(); int flags = 0; Index: trunk/BNC/src/upload/bncuploadcaster.cpp =================================================================== --- trunk/BNC/src/upload/bncuploadcaster.cpp (revision 8203) +++ trunk/BNC/src/upload/bncuploadcaster.cpp (revision 8204) @@ -90,5 +90,5 @@ _outSocket->write(_outBuffer); _outSocket->flush(); - emit newBytes(_mountpoint.toAscii(), _outBuffer.size()); + emit newBytes(_mountpoint.toLatin1(), _outBuffer.size()); } } @@ -140,10 +140,10 @@ delete _outSocket; _outSocket = 0; - emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toAscii(), true)); + emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1(), true)); return; } - QByteArray msg = "SOURCE " + _password.toAscii() + " /" + - _mountpoint.toAscii() + "\r\n" + + QByteArray msg = "SOURCE " + _password.toLatin1() + " /" + + _mountpoint.toLatin1() + "\r\n" + "Source-Agent: NTRIP BNC/" BNCVERSION "\r\n\r\n"; @@ -157,8 +157,8 @@ delete _outSocket; _outSocket = 0; - emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toAscii(), true)); + emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toLatin1(), true)); } else { - emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toAscii(), true)); + emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1(), true)); _sOpenTrial = 0; }