Attachment #192540 for bug #227538

View | Details | Raw Unified | Return to bug 227538
Collapse All | Expand All





PORTNAME=	gpsbabel
DISTVERSIONPREFIX=	${PORTNAME}_
DISTVERSION=	1_5_4
CATEGORIES=	astro geography

MAINTAINER=	dev2@heesakkers.info


CONFLICTS=	gpsbabel14-[0-9]*

USE_QT5=	core qmake_build
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-zlib=system
USES=		localbase

OPTIONS_SUB=	yes

GUI_ALL_TARGET=	gui
GUI_USE=	QT5=gui,xml,network,webkit
GUI_USE+=	QT5=linguisttools_build,moc_build,rcc_build,uic_build
GUI_VARS=	MAKE_JOBS_UNSAFE=yes

post-patch:

Lines 1-2 Link Here

(-)b/astro/gpsbabel/distinfo (-2 / +3 lines)
1	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_3_GH0.tar.gz) = 10b7aaca44ce557fa1175fec37297b8df55611ab2c51cb199753a22dbf2d3997	1	TIMESTAMP = 1523450580
2	SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_3_GH0.tar.gz) = 8516277	2	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
		3	SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 9121510




--- exif.cc.orig	2016-01-03 02:09:17 UTC
+++ exif.cc
@@ -1100,7 +1100,7 @@ exif_find_wpt_by_time(const Waypoint* wp
 
   if (exif_wpt_ref == NULL) {
     exif_wpt_ref = wpt;
-  } else if (abs(exif_time_ref - wpt->creation_time.toTime_t()) < abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
+  } else if (qAbs(exif_time_ref - wpt->creation_time.toTime_t()) < qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
     exif_wpt_ref = wpt;
   }
 }
@@ -1447,12 +1447,12 @@ exif_write(void)
 
     if (exif_wpt_ref == NULL) {
       warning(MYNAME ": No point with a valid timestamp found.\n");
-    } else if (abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
+    } else if (qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
       warning(MYNAME ": No matching point found for image date %s!\n", qPrintable(str));
       if (exif_wpt_ref != NULL) {
         QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t());
         warning(MYNAME ": Best is from %s, %d second(s) away.\n",
-                qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
+                qPrintable(str), (int) qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
       }
       exif_wpt_ref = NULL;
     }

Added Link Here

(-)b/astro/gpsbabel/files/patch-garmin__device__xml.cc (+11 lines)
1	--- garmin_device_xml.cc.orig 2018-04-11 18:10:39 UTC
2	+++ garmin_device_xml.cc
3	@@ -41,7 +41,7 @@ jmp_buf gdx_jmp_buf;
4
5	void type_s(xg_string args, const QXmlStreamAttributes*)
6	{
7	- type = args.compare("GPSData");
8	+ type = args.compare(QLatin1String("GPSData"));
9	}
10
11	void device_s(xg_string args, const QXmlStreamAttributes*)




--- gpx.cc.orig	2018-04-11 18:10:39 UTC
+++ gpx.cc
@@ -494,7 +494,7 @@
 {
   cache_descr_is_html = 0;
   if (attr.hasAttribute("html")) {
-    if (attr.value("html").toString().compare("True") == 0) {
+    if (attr.value("html").compare(QLatin1String("True")) == 0) {
       cache_descr_is_html = 1;
     }
   }
@@ -509,16 +509,16 @@
     gc_data->id = attr.value("id").toString().toInt();
   }
   if (attr.hasAttribute("available")) {
-    if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
+    if (attr.value("available").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
       gc_data->is_available = status_true;
-    } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
+    } else if (attr.value("available").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
       gc_data->is_available = status_false;
     }
   }
   if (attr.hasAttribute("archived")) {
-    if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
+    if (attr.value("archived").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
       gc_data->is_archived = status_true;
-    } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
+    } else if (attr.value("archived").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
       gc_data->is_archived = status_false;
     }
   }
@@ -972,7 +972,7 @@
      * last date we saw in this log.
      */
   case tt_cache_log_type:
-    if ((cdatastr.compare("Found it") == 0) &&
+    if ((cdatastr.compare(QLatin1String("Found it")) == 0) &&
         (0 == wpt_tmp->gc_data->last_found.toTime_t())) {
       wpt_tmp->AllocGCData()->last_found = gc_log_date;
     }
@@ -1423,7 +1423,7 @@
         fprint_xml_chain(tag->child, wpt);
       }
       if (wpt && wpt->gc_data->exported.isValid() &&
-          tag->tagname.compare("groundspeak:cache") == 0) {
+          tag->tagname.compare(QLatin1String("groundspeak:cache")) == 0) {
         writer->writeTextElement("time",
                                  wpt->gc_data->exported.toPrettyString());
       }

Added Link Here

(-)b/astro/gpsbabel/files/patch-lowranceusr.cc (+11 lines)
1	--- lowranceusr.cc.orig 2018-04-11 18:16:00 UTC
2	+++ lowranceusr.cc
3	@@ -767,7 +767,7 @@ lowranceusr_waypt_disp(const Waypoint* w
4
5	gbfputint32(Time, file_out);
6
7	- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") == 0) {
8	+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) == 0) {
9	SymbolId = lowranceusr_find_icon_number_from_desc(get_cache_icon(wpt));
10	} else {
11	SymbolId = lowranceusr_find_icon_number_from_desc(wpt->icon_descr);




--- magproto.cc.orig	2018-04-11 18:16:46 UTC
+++ magproto.cc
@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna
    */
   QString exten = QFileInfo(curfname).suffix();
   if (exten.length() > 0) {
-    if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
+    if (0 == exten.compare(QLatin1String("upt"), Qt::CaseInsensitive)) {
       extension_hint = WPTDATAMASK;
-    } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
+    } else if (0 == exten.compare(QLatin1String("log"), Qt::CaseInsensitive)) {
       extension_hint = TRKDATAMASK;
-    } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
+    } else if (0 == exten.compare(QLatin1String("rte"), Qt::CaseInsensitive)) {
       extension_hint = RTEDATAMASK;
     }
   }

Added Link Here

(-)b/astro/gpsbabel/files/patch-psitrex.cc (+11 lines)
1	--- psitrex.cc.orig 2018-04-11 18:17:53 UTC
2	+++ psitrex.cc
3	@@ -363,7 +363,7 @@ psit_waypoint_w(gbfile* psit_file, const
4
5	icon = gt_find_icon_number_from_desc(wpt->icon_descr, PCX);
6
7	- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") != 0) {
8	+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) != 0) {
9	icon = gt_find_icon_number_from_desc(get_cache_icon(wpt), PCX);
10	}
11




--- tef_xml.cc.orig	2018-04-11 18:10:39 UTC
+++ tef_xml.cc
@@ -72,11 +72,11 @@
   bool valid = false;
 
   foreach(QXmlStreamAttribute attr, *attrv) {
-    if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
-      if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
+    if (attr.name().compare(QLatin1String("Comment"), Qt::CaseInsensitive) == 0) {
+      if (attr.value().compare(QLatin1String("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
         valid = true;
       }
-    } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Version"), Qt::CaseInsensitive) == 0) {
       version = attr.value().toString().toDouble();
     }
   }
@@ -95,9 +95,9 @@
 {
   route = route_head_alloc();
   foreach(QXmlStreamAttribute attr, *attrv) {
-    if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
+    if (attr.name().compare(QLatin1String("Name"), Qt::CaseInsensitive) == 0) {
       route->rte_name = attr.value().toString().trimmed();
-    } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Software"), Qt::CaseInsensitive) == 0) {
       route->rte_desc = attr.value().toString().trimmed();
     }
   }
@@ -248,20 +248,20 @@
     QString attrstr = attr.value().toString();
     QByteArray attrtext = attrstr.toUtf8();
 
-    if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
+    if (attr.name().compare(QLatin1String("SegDescription"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->shortname = attrstr.trimmed();
-    } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("PointDescription"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->description = attrstr.trimmed();
-    } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
-               attr.value().compare("true", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("ViaStation"), Qt::CaseInsensitive) == 0 &&
+               attr.value().compare(QLatin1String("true"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->wpt_flags.fmt_use = 1;  /* only a flag */
 
       /* new in TEF V2 */
-    } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Instruction"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->description = attrstr.trimmed();
-    } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Altitude"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->altitude = attrstr.toDouble();
-    } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("TimeStamp"), Qt::CaseInsensitive) == 0) {
       /* nothing for the moment */
     }
   }




--- unicsv.cc.orig	2018-04-11 18:21:19 UTC
+++ unicsv.cc
@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in
 static status_type
 unicsv_parse_status(const QString& str)
 {
-  if (str.compare("true", Qt::CaseInsensitive) == 0 ||
-      str.compare("yes", Qt::CaseInsensitive) == 0 ||
+  if (str.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 ||
+      str.compare(QLatin1String("yes"), Qt::CaseInsensitive) == 0 ||
       str == "1") {
     return status_true;
   }
-  if (str.compare("false", Qt::CaseInsensitive) == 0 ||
-      str.compare("no", Qt::CaseInsensitive) == 0 ||
+  if (str.compare(QLatin1String("false"), Qt::CaseInsensitive) == 0 ||
+      str.compare(QLatin1String("no"), Qt::CaseInsensitive) == 0 ||
       str == "0") {
     return status_false;
   }

Return to bug 227538

Lines 3-9 Link Here

(-)b/astro/gpsbabel/Makefile (-4 / +4 lines)
3		3
4	PORTNAME= gpsbabel	4	PORTNAME= gpsbabel
5	DISTVERSIONPREFIX= ${PORTNAME}_	5	DISTVERSIONPREFIX= ${PORTNAME}_
6	DISTVERSION= 1_5_3	6	DISTVERSION= 1_5_4
7	CATEGORIES= astro geography	7	CATEGORIES= astro geography
8		8
9	MAINTAINER= dev2@heesakkers.info	9	MAINTAINER= dev2@heesakkers.info
Lines 19-25 USE_GITHUB= yes Link Here
19		19
20	CONFLICTS= gpsbabel14-[0-9]*	20	CONFLICTS= gpsbabel14-[0-9]*
21		21
22	USE_QT4= corelib qmake_build	22	USE_QT5= core qmake_build
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --with-zlib=system	24	CONFIGURE_ARGS= --with-zlib=system
25	USES= localbase	25	USES= localbase
Lines 28-35 OPTIONS_DEFINE= GUI Link Here
28	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
29		29
30	GUI_ALL_TARGET= gui	30	GUI_ALL_TARGET= gui
31	GUI_USE= QT4=gui,xml,network,webkit	31	GUI_USE= QT5=gui,xml,network,webkit
32	GUI_USE+= QT4=linguisttools_build,moc_build,rcc_build,uic_build	32	GUI_USE+= QT5=linguisttools_build,moc_build,rcc_build,uic_build
33	GUI_VARS= MAKE_JOBS_UNSAFE=yes	33	GUI_VARS= MAKE_JOBS_UNSAFE=yes
34		34
35	post-patch:	35	post-patch:

Removed Link Here

(-)a/astro/gpsbabel/files/patch-exif.cc (-26 lines)
1	--- exif.cc.orig 2016-01-03 02:09:17 UTC
2	+++ exif.cc
3	@@ -1100,7 +1100,7 @@ exif_find_wpt_by_time(const Waypoint* wp
4
5	if (exif_wpt_ref == NULL) {
6	exif_wpt_ref = wpt;
7	- } else if (abs(exif_time_ref - wpt->creation_time.toTime_t()) < abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
8	+ } else if (qAbs(exif_time_ref - wpt->creation_time.toTime_t()) < qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) {
9	exif_wpt_ref = wpt;
10	}
11	}
12	@@ -1447,12 +1447,12 @@ exif_write(void)
13
14	if (exif_wpt_ref == NULL) {
15	warning(MYNAME ": No point with a valid timestamp found.\n");
16	- } else if (abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
17	+ } else if (qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
18	warning(MYNAME ": No matching point found for image date %s!\n", qPrintable(str));
19	if (exif_wpt_ref != NULL) {
20	QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t());
21	warning(MYNAME ": Best is from %s, %d second(s) away.\n",
22	- qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
23	+ qPrintable(str), (int) qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()));
24	}
25	exif_wpt_ref = NULL;
26	}

Added Link Here

(-)b/astro/gpsbabel/files/patch-gpx.cc (+50 lines)
1	--- gpx.cc.orig 2018-04-11 18:10:39 UTC
2	+++ gpx.cc
3	@@ -494,7 +494,7 @@
4	{
5	cache_descr_is_html = 0;
6	if (attr.hasAttribute("html")) {
7	- if (attr.value("html").toString().compare("True") == 0) {
8	+ if (attr.value("html").compare(QLatin1String("True")) == 0) {
9	cache_descr_is_html = 1;
10	}
11	}
12	@@ -509,16 +509,16 @@
13	gc_data->id = attr.value("id").toString().toInt();
14	}
15	if (attr.hasAttribute("available")) {
16	- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
17	+ if (attr.value("available").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
18	gc_data->is_available = status_true;
19	- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
20	+ } else if (attr.value("available").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
21	gc_data->is_available = status_false;
22	}
23	}
24	if (attr.hasAttribute("archived")) {
25	- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
26	+ if (attr.value("archived").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
27	gc_data->is_archived = status_true;
28	- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
29	+ } else if (attr.value("archived").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
30	gc_data->is_archived = status_false;
31	}
32	}
33	@@ -972,7 +972,7 @@
34	* last date we saw in this log.
35	*/
36	case tt_cache_log_type:
37	- if ((cdatastr.compare("Found it") == 0) &&
38	+ if ((cdatastr.compare(QLatin1String("Found it")) == 0) &&
39	(0 == wpt_tmp->gc_data->last_found.toTime_t())) {
40	wpt_tmp->AllocGCData()->last_found = gc_log_date;
41	}
42	@@ -1423,7 +1423,7 @@
43	fprint_xml_chain(tag->child, wpt);
44	}
45	if (wpt && wpt->gc_data->exported.isValid() &&
46	- tag->tagname.compare("groundspeak:cache") == 0) {
47	+ tag->tagname.compare(QLatin1String("groundspeak:cache")) == 0) {
48	writer->writeTextElement("time",
49	wpt->gc_data->exported.toPrettyString());
50	}

Added Link Here

(-)b/astro/gpsbabel/files/patch-magproto.cc (+17 lines)
1	--- magproto.cc.orig 2018-04-11 18:16:46 UTC
2	+++ magproto.cc
3	@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna
4	*/
5	QString exten = QFileInfo(curfname).suffix();
6	if (exten.length() > 0) {
7	- if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
8	+ if (0 == exten.compare(QLatin1String("upt"), Qt::CaseInsensitive)) {
9	extension_hint = WPTDATAMASK;
10	- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
11	+ } else if (0 == exten.compare(QLatin1String("log"), Qt::CaseInsensitive)) {
12	extension_hint = TRKDATAMASK;
13	- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
14	+ } else if (0 == exten.compare(QLatin1String("rte"), Qt::CaseInsensitive)) {
15	extension_hint = RTEDATAMASK;
16	}
17	}

Added Link Here

(-)b/astro/gpsbabel/files/patch-tef_xml.cc (+57 lines)
1	--- tef_xml.cc.orig 2018-04-11 18:10:39 UTC
2	+++ tef_xml.cc
3	@@ -72,11 +72,11 @@
4	bool valid = false;
5
6	foreach(QXmlStreamAttribute attr, *attrv) {
7	- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
8	- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
9	+ if (attr.name().compare(QLatin1String("Comment"), Qt::CaseInsensitive) == 0) {
10	+ if (attr.value().compare(QLatin1String("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
11	valid = true;
12	}
13	- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
14	+ } else if (attr.name().compare(QLatin1String("Version"), Qt::CaseInsensitive) == 0) {
15	version = attr.value().toString().toDouble();
16	}
17	}
18	@@ -95,9 +95,9 @@
19	{
20	route = route_head_alloc();
21	foreach(QXmlStreamAttribute attr, *attrv) {
22	- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
23	+ if (attr.name().compare(QLatin1String("Name"), Qt::CaseInsensitive) == 0) {
24	route->rte_name = attr.value().toString().trimmed();
25	- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
26	+ } else if (attr.name().compare(QLatin1String("Software"), Qt::CaseInsensitive) == 0) {
27	route->rte_desc = attr.value().toString().trimmed();
28	}
29	}
30	@@ -248,20 +248,20 @@
31	QString attrstr = attr.value().toString();
32	QByteArray attrtext = attrstr.toUtf8();
33
34	- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
35	+ if (attr.name().compare(QLatin1String("SegDescription"), Qt::CaseInsensitive) == 0) {
36	wpt_tmp->shortname = attrstr.trimmed();
37	- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
38	+ } else if (attr.name().compare(QLatin1String("PointDescription"), Qt::CaseInsensitive) == 0) {
39	wpt_tmp->description = attrstr.trimmed();
40	- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
41	- attr.value().compare("true", Qt::CaseInsensitive) == 0) {
42	+ } else if (attr.name().compare(QLatin1String("ViaStation"), Qt::CaseInsensitive) == 0 &&
43	+ attr.value().compare(QLatin1String("true"), Qt::CaseInsensitive) == 0) {
44	wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */
45
46	/* new in TEF V2 */
47	- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
48	+ } else if (attr.name().compare(QLatin1String("Instruction"), Qt::CaseInsensitive) == 0) {
49	wpt_tmp->description = attrstr.trimmed();
50	- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
51	+ } else if (attr.name().compare(QLatin1String("Altitude"), Qt::CaseInsensitive) == 0) {
52	wpt_tmp->altitude = attrstr.toDouble();
53	- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
54	+ } else if (attr.name().compare(QLatin1String("TimeStamp"), Qt::CaseInsensitive) == 0) {
55	/* nothing for the moment */
56	}
57	}

Added Link Here

(-)b/astro/gpsbabel/files/patch-unicsv.cc (+20 lines)
1	--- unicsv.cc.orig 2018-04-11 18:21:19 UTC
2	+++ unicsv.cc
3	@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in
4	static status_type
5	unicsv_parse_status(const QString& str)
6	{
7	- if (str.compare("true", Qt::CaseInsensitive) == 0 \|\|
8	- str.compare("yes", Qt::CaseInsensitive) == 0 \|\|
9	+ if (str.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 \|\|
10	+ str.compare(QLatin1String("yes"), Qt::CaseInsensitive) == 0 \|\|
11	str == "1") {
12	return status_true;
13	}
14	- if (str.compare("false", Qt::CaseInsensitive) == 0 \|\|
15	- str.compare("no", Qt::CaseInsensitive) == 0 \|\|
16	+ if (str.compare(QLatin1String("false"), Qt::CaseInsensitive) == 0 \|\|
17	+ str.compare(QLatin1String("no"), Qt::CaseInsensitive) == 0 \|\|
18	str == "0") {
19	return status_false;
20	}