diff --git a/src/QGCQFileDialog.cc b/src/QGCQFileDialog.cc index 21fa68b034290492e57cf3730a41f41d02e1db3f..cd7aa48b787ce8114e955c6990dd43d482f0421d 100644 --- a/src/QGCQFileDialog.cc +++ b/src/QGCQFileDialog.cc @@ -159,7 +159,7 @@ QString QGCQFileDialog::getSaveFileName( } break; } - return QString(""); + return {}; } } @@ -190,7 +190,7 @@ QString QGCQFileDialog::_getFirstExtensionInFilter(const QString& filter) { return match.captured(0).mid(2); } } - return QString(""); + return {}; } /// @brief Validates and updates the parameters for the file dialog calls diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp index e916217f4fb8862efc638f3842d7341f6beefb79..4f8437eaae329801834d42ff6c33475a07508dfd 100644 --- a/src/QtLocationPlugin/QGCMapUrlEngine.cpp +++ b/src/QtLocationPlugin/QGCMapUrlEngine.cpp @@ -435,7 +435,7 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager* int y_max = 26 * pow(2, gap) + (2*gap - 1); if ( zoom > 19 ) { - return QString(""); + return {}; } else if ( zoom > 5 && x >= x_min && x <= x_max && y >= y_min && y <= y_max ) { return QString("http://xdworld.vworld.kr:8080/2d/Base/service/%1/%2/%3.png").arg(zoom).arg(x).arg(y); @@ -458,7 +458,7 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager* int y_max = 26 * pow(2, gap) + (2*gap - 1); if ( zoom > 19 ) { - return QString(""); + return {}; } else if ( zoom > 5 && x >= x_min && x <= x_max && y >= y_min && y <= y_max ) { return QString("http://xdworld.vworld.kr:8080/2d/Satellite/service/%1/%2/%3.jpeg").arg(zoom).arg(x).arg(y); diff --git a/src/comm/BluetoothLink.cc b/src/comm/BluetoothLink.cc index 7819f84b944cf3ad9d80a70e26f8def93e0a0a64..6d3eb915003d6f5c244c2835bf1f56a071a91957 100644 --- a/src/comm/BluetoothLink.cc +++ b/src/comm/BluetoothLink.cc @@ -390,7 +390,7 @@ void BluetoothConfiguration::setDevName(const QString &name) QString BluetoothConfiguration::address() { #ifdef __ios__ - return QString(""); + return {}; #else return _device.address; #endif diff --git a/src/comm/TCPLink.cc b/src/comm/TCPLink.cc index 2407685edc2815ea169432258334096e27abe62c..ecb27e2b7c9ca43dd1411bff4ab72626045095f1 100644 --- a/src/comm/TCPLink.cc +++ b/src/comm/TCPLink.cc @@ -262,7 +262,7 @@ static QString get_ip_address(const QString& address) } } } - return QString(""); + return {}; } TCPConfiguration::TCPConfiguration(const QString& name) : LinkConfiguration(name) diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc index 606c72265453482ed7a1800a1d76da00dd2984c9..58fe36da5341d6ac68115be1ee787ec787acc6d9 100644 --- a/src/comm/UDPLink.cc +++ b/src/comm/UDPLink.cc @@ -65,7 +65,7 @@ static QString get_ip_address(const QString& address) } } } - return QString(""); + return {}; } static bool contains_target(const QList list, const QHostAddress& address, quint16 port)