Correct the usage of std::string and QString

QStrings shouldn't be == "" to check for empty string, use .isEmpty()
QStrings shouldn't be != "" to check for non empty, use .size()
std::string shouldn't be cleared with = "", use .clear()

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

5 files changed, 18 insertions, 18 deletions

diff --git a/qt-gui.cpp b/qt-gui.cpp
index f2b655e14..868389eab 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -372,7 +372,7 @@ int parseTemperatureToMkelvin(const QString &text)
 	int mkelvin;
 	QString numOnly = text;
 	numOnly.replace(",", ".").remove(QRegExp("[^-0-9.]"));
-	if (numOnly == "")
+	if (numOnly.isEmpty())
 		return 0;
 	double number = numOnly.toDouble();
 	switch (prefs.units.temperature) {
diff --git a/qt-ui/exif.cpp b/qt-ui/exif.cpp
index 2614d52e6..82601577f 100644
--- a/qt-ui/exif.cpp
+++ b/qt-ui/exif.cpp
@@ -525,15 +525,15 @@ int EXIFInfo::parseFromEXIFSegment(const unsigned char *buf, unsigned len)
 void EXIFInfo::clear()
 {
 	// Strings
-	ImageDescription = "";
-	Make = "";
-	Model = "";
-	Software = "";
-	DateTime = "";
-	DateTimeOriginal = "";
-	DateTimeDigitized = "";
-	SubSecTimeOriginal = "";
-	Copyright = "";
+	ImageDescription.clear();
+	Make.clear();
+	Model.clear();
+	Software.clear();
+	DateTime.clear();
+	DateTimeOriginal.clear();
+	DateTimeDigitized.clear();
+	SubSecTimeOriginal.clear();
+	Copyright.clear();
 
 	// Shorts / unsigned / double
 	ByteAlign = 0;
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 9f66e2bd1..1101500d3 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -48,11 +48,11 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
 	QDir marble;
 	if (!list.contains("earth/googlesat/googlesat.dgml")) {
 		subsurfaceDataPath = getSubsurfaceDataPath("marbledata");
-		if (subsurfaceDataPath != "") {
+		if (subsurfaceDataPath.size()) {
 			MarbleDirs::setMarbleDataPath(subsurfaceDataPath);
 		} else {
 			subsurfaceDataPath = getSubsurfaceDataPath("data");
-			if (subsurfaceDataPath != "")
+			if (subsurfaceDataPath.size())
 				MarbleDirs::setMarbleDataPath(subsurfaceDataPath);
 		}
 	}
diff --git a/qt-ui/usermanual.cpp b/qt-ui/usermanual.cpp
index 89e556d60..0dd39af33 100644
--- a/qt-ui/usermanual.cpp
+++ b/qt-ui/usermanual.cpp
@@ -30,7 +30,7 @@ UserManual::UserManual(QWidget *parent) : QMainWindow(parent),
 
 	ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 	QString searchPath = getSubsurfaceDataPath("Documentation");
-	if (searchPath != "") {
+	if (searchPath.size()) {
 		QUrl url(searchPath.append("/user-manual.html"));
 		ui->webView->setUrl(url);
 	} else {
diff --git a/qthelper.cpp b/qthelper.cpp
index f265833b4..a421d7f66 100644
--- a/qthelper.cpp
+++ b/qthelper.cpp
@@ -66,17 +66,17 @@ const DiveComputerNode *DiveComputerList::get(QString m)
 
 void DiveComputerList::addDC(QString m, uint32_t d, QString n, QString s, QString f)
 {
-	if (m == "" || d == 0)
+	if (m.isEmpty() || d == 0)
 		return;
 	const DiveComputerNode *existNode = this->getExact(m, d);
 	DiveComputerNode newNode(m, d, s, f, n);
 	if (existNode) {
 		if (newNode.changesValues(*existNode)) {
-			if (n != "" && existNode->nickName != n)
+			if (n.size() && existNode->nickName != n)
 				qDebug("new nickname %s for DC model %s deviceId 0x%x", n.toUtf8().data(), m.toUtf8().data(), d);
-			if (f != "" && existNode->firmware != f)
+			if (f.size() && existNode->firmware != f)
 				qDebug("new firmware version %s for DC model %s deviceId 0x%x", f.toUtf8().data(), m.toUtf8().data(), d);
-			if (s != "" && existNode->serialNumber != s)
+			if (s.size() && existNode->serialNumber != s)
 				qDebug("new serial number %s for DC model %s deviceId 0x%x", s.toUtf8().data(), m.toUtf8().data(), d);
 		} else {
 			return;
@@ -127,7 +127,7 @@ bool parseGpsText(const QString &gps_text, double *latitude, double *longitude)
 	trHemisphere[3] = MainWindow::instance()->information()->trHemisphere("W");
 	QString regExp;
 	/* an empty string is interpreted as 0.0,0.0 and therefore "no gps location" */
-	if (gps_text.trimmed() == "") {
+	if (gps_text.trimmed().isEmpty()) {
 		*latitude = 0.0;
 		*longitude = 0.0;
 		return true;