Browse Source

Merge pull request #8351 from patrickelectric/sprintf_deprecated

Remove deprecated QString::sprintf
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
c77b63bacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/QtLocationPlugin/QGCMapEngine.cpp
  2. 2
      src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
  3. 2
      src/comm/TCPLink.cc

2
src/QtLocationPlugin/QGCMapEngine.cpp

@ -222,7 +222,7 @@ QGCMapEngine::cacheTile(QString type, const QString& hash, const QByteArray& ima @@ -222,7 +222,7 @@ QGCMapEngine::cacheTile(QString type, const QString& hash, const QByteArray& ima
QString
QGCMapEngine::getTileHash(QString type, int x, int y, int z)
{
return QString().sprintf("%010d%08d%08d%03d", getQGCMapEngine()->urlFactory()->getIdFromType(type), x, y, z);
return QString::asprintf("%010d%08d%08d%03d", getQGCMapEngine()->urlFactory()->getIdFromType(type), x, y, z);
}
//-----------------------------------------------------------------------------

2
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

@ -553,7 +553,7 @@ QGCMapEngineManager::getUniqueName() @@ -553,7 +553,7 @@ QGCMapEngineManager::getUniqueName()
int count = 1;
while (true) {
name = test;
name += QString().sprintf("%03d", count++);
name += QString::asprintf("%03d", count++);
if(!findName(name))
return name;
}

2
src/comm/TCPLink.cc

@ -57,7 +57,7 @@ void TCPLink::_writeDebugBytes(const QByteArray data) @@ -57,7 +57,7 @@ void TCPLink::_writeDebugBytes(const QByteArray data)
for (int i=0, size = data.size(); i<size; i++)
{
unsigned char v = data[i];
bytes.append(QString().sprintf("%02x ", v));
bytes.append(QString::asprintf("%02x ", v));
if (data[i] > 31 && data[i] < 127)
{
ascii.append(data[i]);

Loading…
Cancel
Save