Fixed conflicts

This commit is contained in:
Fred Gleason
2020-02-21 16:56:03 -05:00
3 changed files with 15 additions and 4 deletions

View File

@@ -1161,10 +1161,10 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
logline->setExtStartTime(QTime().addSecs(3600*start_start_hour+
q->value(1).toInt()));
logline->setExtLength(q->value(2).toInt());
logline->setExtData(q->value(3).toString());
logline->setExtEventId(q->value(4).toString());
logline->setExtAnncType(q->value(5).toString());
logline->setExtCartName(q->value(6).toString());
logline->setExtData(q->value(3).toString().trimmed());
logline->setExtEventId(q->value(4).toString().trimmed());
logline->setExtAnncType(q->value(5).toString().trimmed());
logline->setExtCartName(q->value(6).toString().trimmed());
logline->setEventLength(event_length);
logline->setLinkEventName(event_name);
logline->setLinkStartTime(link_logline->linkStartTime());