Skip to content

Commit

Permalink
fixes for #722, Mechanically remove QStringRef use for QStringView to…
Browse files Browse the repository at this point in the history
… help with Qt6. (#723)

* Fix typo in maggeo from search-and-replace work earlier.

* Revert startOfDate() calls to keep floor at 5.12.x to keep builders happy. :-/

* Explictly get QString from StringView in gpx for compat with older Qt builds.

Co-authored-by: Robert Lipe <robertlipe@gmail.com>
  • Loading branch information
tsteven4 and robertlipe authored Sep 27, 2021
1 parent 518c46a commit 2be0ce7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gpx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ void
GpxFormat::gpx_cdata(const QStringView& s)
{
QString* cdata;
cdatastr += s;
cdatastr += s.toString();

if (!cur_tag) {
return;
Expand Down
2 changes: 1 addition & 1 deletion maggeo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static QDateTime maggeo_parsedate(char* dmy)
int d = date.midRef(0,2).toInt();
int m = date.midRef(2,2).toInt();
int y = date.midRef(4,3).toInt();
QDateTime r(QDate(y + 1900, m, d)::startOfDay());
QDateTime r(QDate(y + 1900, m, d));
return r;
}

Expand Down
2 changes: 1 addition & 1 deletion xcsv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ QDateTime
XcsvFormat::yyyymmdd_to_time(const char* s)
{
QDate d = QDate::fromString(s, "yyyyMMdd");
return QDateTime(d.startOfDay());
return QDateTime(d);
}


Expand Down

0 comments on commit 2be0ce7

Please sign in to comment.