Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-13 08:06:38 +01:00
Code Issues Projects Releases Wiki Activity

2021-09-01 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up deprecation warnings for 'QString::sprintf()'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-09-01 19:59:37 -04:00
parent 327ceacc06
commit ac594cc68b
298 changed files with 2880 additions and 2879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
lib/rdsvc.cpp
View File

@@ -573,7 +573,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
//
sql=QString("delete from `IMPORTER_LINES` where ")+
"`STATION_NAME`='"+RDEscapeString(svc_station->name())+"' && "+
QString().sprintf("`PROCESS_ID`=%u",getpid());
QString::asprintf("`PROCESS_ID`=%u",getpid());
RDSqlQuery::apply(sql);
//
@@ -658,27 +658,27 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
//
sql=QString("insert into `IMPORTER_LINES` set ")+
"`STATION_NAME`='"+RDEscapeString(svc_station->name())+"',"+
QString().sprintf("`PROCESS_ID`=%d,",getpid())+
QString().sprintf("`FILE_LINE`=%u,",file_line)+
QString().sprintf("`LINE_ID`=%d,",line_id);
QString::asprintf("`PROCESS_ID`=%d,",getpid())+
QString::asprintf("`FILE_LINE`=%u,",file_line)+
QString::asprintf("`LINE_ID`=%d,",line_id);
if(start_time_ok) {
sql+=QString().sprintf("`START_HOUR`=%d,",start_hour)+
QString().sprintf("`START_SECS`=%d,",60*start_minutes+start_seconds);
sql+=QString::asprintf("`START_HOUR`=%d,",start_hour)+
QString::asprintf("`START_SECS`=%d,",60*start_minutes+start_seconds);
}
if(cartlen>=0) {
sql+=QString().sprintf("`LENGTH`=%d,",cartlen);
sql+=QString::asprintf("`LENGTH`=%d,",cartlen);
}
//
// Cart
//
if(start_time_ok&&cart_ok&&(cartnum>0)&&(cartnum<=RD_MAX_CART_NUMBER)) {
sql+=QString().sprintf("`TYPE`=%u,",RDLogLine::Cart)+
sql+=QString::asprintf("`TYPE`=%u,",RDLogLine::Cart)+
"`EXT_DATA`='"+data_buf.trimmed()+"',"+
"`EXT_EVENT_ID`='"+eventid_buf.trimmed()+"',"+
"`EXT_ANNC_TYPE`='"+annctype_buf.trimmed()+"',"+
"`EXT_CART_NAME`='"+cartname.trimmed()+"',"+
QString().sprintf("`CART_NUMBER`=%u,",cartnum)+
QString::asprintf("`CART_NUMBER`=%u,",cartnum)+
"`TITLE`='"+RDEscapeString(title)+"'";
RDSqlQuery::apply(sql);
line_id++;
@@ -691,7 +691,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
//
if((src==RDSvc::Music)&&(!break_str.isEmpty())) {
if(str_buf.contains(break_str)) {
sql+=QString().sprintf("`TYPE`=%u ",RDLogLine::TrafficLink);
sql+=QString::asprintf("`TYPE`=%u ",RDLogLine::TrafficLink);
RDSqlQuery::apply(sql);
line_id++;
file_line++;
@@ -703,7 +703,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
// Track Marker
//
if((!track_str.isEmpty())&&(str_buf.contains(track_str))) {
sql+=QString().sprintf("`TYPE`=%u,",RDLogLine::Track);
sql+=QString::asprintf("`TYPE`=%u,",RDLogLine::Track);
switch(inherit) {
case RDSvc::ParentEvent:
sql+="`TITLE`='"+RDEscapeString(str_buf.simplified().trimmed())+"'";
@@ -723,7 +723,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
// Label/Note Cart
//
if((!label_cart.isEmpty())&&(str_buf.contains(label_cart))) {
sql+=QString().sprintf("`TYPE`=%u,",RDLogLine::Marker);
sql+=QString::asprintf("`TYPE`=%u,",RDLogLine::Marker);
switch(inherit) {
case RDSvc::ParentEvent:
sql+="`TITLE`='"+RDEscapeString(str_buf.simplified().trimmed())+"'";
@@ -763,7 +763,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
"`LENGTH` "+ // 03
"from `IMPORTER_LINES` where "+
"`STATION_NAME`='"+RDEscapeString(svc_station->name())+"' && "+
QString().sprintf("`PROCESS_ID`=%d ",getpid())+
QString::asprintf("`PROCESS_ID`=%d ",getpid())+
"order by `FILE_LINE`";
q=new RDSqlQuery(sql);
while(q->next()) {
@@ -775,12 +775,12 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
len=0;
}
sql=QString("update `IMPORTER_LINES` set ")+
QString().sprintf("`START_HOUR`=%d,",prev_hour)+
QString().sprintf("`START_SECS`=%d,",prev_secs+prev_length/1000)+
QString().sprintf("`LENGTH`=%d ",len)+
QString::asprintf("`START_HOUR`=%d,",prev_hour)+
QString::asprintf("`START_SECS`=%d,",prev_secs+prev_length/1000)+
QString::asprintf("`LENGTH`=%d ",len)+
"where ";
for(int i=0;i<prev_ids.size();i++) {
sql+=QString().sprintf("(`ID`=%u)||",prev_ids.at(i));
sql+=QString::asprintf("(`ID`=%u)||",prev_ids.at(i));
}
sql=sql.left(sql.length()-2);
RDSqlQuery::apply(sql);
@@ -801,12 +801,12 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
//
if(prev_ids.size()>0) {
sql=QString("update `IMPORTER_LINES` set ")+
QString().sprintf("`START_HOUR`=%d,",prev_hour)+
QString().sprintf("`START_SECS`=%d,",prev_secs+prev_length/1000)+
QString::asprintf("`START_HOUR`=%d,",prev_hour)+
QString::asprintf("`START_SECS`=%d,",prev_secs+prev_length/1000)+
"`LENGTH`=0 "+
"where ";
for(int i=0;i<prev_ids.size();i++) {
sql+=QString().sprintf("(`ID`=%u)||",prev_ids.at(i));
sql+=QString::asprintf("(`ID`=%u)||",prev_ids.at(i));
}
sql=sql.left(sql.length()-2);
RDSqlQuery::apply(sql);
@@ -870,7 +870,7 @@ bool RDSvc::generateLog(const QDate &date,const QString &logname,
for(int i=0;i<24;i++) {
sql=QString("select `CLOCK_NAME` from `SERVICE_CLOCKS` where ")+
"(`SERVICE_NAME`='"+RDEscapeString(svc_name)+"')&&"+
QString().sprintf("(`HOUR`=%d)",24*(date.dayOfWeek()-1)+i);
QString::asprintf("(`HOUR`=%d)",24*(date.dayOfWeek()-1)+i);
q=new RDSqlQuery(sql);
if(q->first()) {
if((!q->value(0).isNull())&&(!q->value(0).toString().isEmpty())) {
@@ -907,12 +907,12 @@ bool RDSvc::generateLog(const QDate &date,const QString &logname,
if(chainto()) {
sql=QString("insert into `LOG_LINES` set ")+
"`LOG_NAME`='"+RDEscapeString(logname)+"',"+
QString().sprintf("`LINE_ID`=%d,",count)+
QString().sprintf("`COUNT`=%d,",count)+
QString().sprintf("`TYPE`=%d,",RDLogLine::Chain)+
QString().sprintf("`SOURCE`=%d,",RDLogLine::Template)+
QString().sprintf("`TRANS_TYPE`=%d,",RDLogLine::Segue)+
QString().sprintf("`TIME_TYPE`=%d,",RDLogLine::Relative)+
QString::asprintf("`LINE_ID`=%d,",count)+
QString::asprintf("`COUNT`=%d,",count)+
QString::asprintf("`TYPE`=%d,",RDLogLine::Chain)+
QString::asprintf("`SOURCE`=%d,",RDLogLine::Template)+
QString::asprintf("`TRANS_TYPE`=%d,",RDLogLine::Segue)+
QString::asprintf("`TIME_TYPE`=%d,",RDLogLine::Relative)+
"`LABEL`='"+RDEscapeString(nextname)+"'";
q=new RDSqlQuery(sql);
delete q;
@@ -1063,7 +1063,7 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
"on `IMPORTER_LINES`.`CART_NUMBER`=`CART`.`NUMBER` where "+
"`IMPORTER_LINES`.`STATION_NAME`='"+
RDEscapeString(svc_station->name())+"' && "+
QString().sprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
QString::asprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
"`IMPORTER_LINES`.`EVENT_USED`='N' "+
"order by `LINE_ID`";
q=new RDSqlQuery(sql);
@@ -1082,7 +1082,7 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
cartname=q->value(5).toString();
}
link_report+=
QString().sprintf(" - %06u - ",q->value(3).toUInt())+cartname+"\n";
QString::asprintf(" - %06u - ",q->value(3).toUInt())+cartname+"\n";
break;
case RDLogLine::Marker:
@@ -1134,7 +1134,7 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
sql=QString("delete from `IMPORTER_LINES` where ")+
"`STATION_NAME`='"+RDEscapeString(svc_station->name())+"' && "+
QString().sprintf("`PROCESS_ID`=%u",getpid());
QString::asprintf("`PROCESS_ID`=%u",getpid());
// printf("Importer Table Cleanup SQL: %s\n",(const char *)sql);
RDSqlQuery::apply(sql);
delete log_lock;
@@ -1288,7 +1288,7 @@ bool RDSvc::create(const QString &name,QString *err_msg,
for(int i=0;i<168;i++) {
sql=QString("insert into `SERVICE_CLOCKS` set ")+
"`SERVICE_NAME`='"+RDEscapeString(name)+"',"+
QString().sprintf("`HOUR`=%d,",i)+
QString::asprintf("`HOUR`=%d,",i)+
"`CLOCK_NAME`=null";
RDSqlQuery::apply(sql);
}
@@ -1375,13 +1375,13 @@ bool RDSvc::create(const QString &name,QString *err_msg,
"`DESCRIPTION_TEMPLATE`='"+RDEscapeString(q->value(2).toString())+"',"+
"`PROGRAM_CODE`='"+RDEscapeString(q->value(3).toString())+"',"+
"`CHAIN_LOG`='"+RDEscapeString(q->value(4).toString())+"',"+
QString().sprintf("`SUB_EVENT_INHERITANCE`=%d,",q->value(5).toInt())+
QString::asprintf("`SUB_EVENT_INHERITANCE`=%d,",q->value(5).toInt())+
"`TRACK_GROUP`='"+RDEscapeString(q->value(6).toString())+"',"+
"`AUTOSPOT_GROUP`='"+RDEscapeString(q->value(7).toString())+"',"+
QString().sprintf("`DEFAULT_LOG_SHELFLIFE`=%d,",q->value(8).toInt())+
QString().sprintf("`LOG_SHELFLIFE_ORIGIN`=%d,",q->value(9).toInt())+
QString::asprintf("`DEFAULT_LOG_SHELFLIFE`=%d,",q->value(8).toInt())+
QString::asprintf("`LOG_SHELFLIFE_ORIGIN`=%d,",q->value(9).toInt())+
"`AUTO_REFRESH`='"+RDEscapeString(q->value(10).toString())+"',"+
QString().sprintf("`ELR_SHELFLIFE`=%d,",q->value(11).toInt())+
QString::asprintf("`ELR_SHELFLIFE`=%d,",q->value(11).toInt())+
"`TFC_PREIMPORT_CMD`='"+RDEscapeString(q->value(12).toString())+"',"+
"`TFC_IMPORT_TEMPLATE`='"+RDEscapeString(q->value(13).toString())+"',"+
"`TFC_PATH`='"+RDEscapeString(q->value(14).toString())+"',"+
@@ -1389,28 +1389,28 @@ bool RDSvc::create(const QString &name,QString *err_msg,
"`TFC_TRACK_CART`='"+RDEscapeString(q->value(16).toString())+"',"+
"`TFC_BREAK_STRING`='"+RDEscapeString(q->value(17).toString())+"',"+
"`TFC_TRACK_STRING`='"+RDEscapeString(q->value(18).toString())+"',"+
QString().sprintf("`TFC_CART_OFFSET`=%d,",q->value(19).toInt())+
QString().sprintf("`TFC_CART_LENGTH`=%d,",q->value(20).toInt())+
QString().sprintf("`TFC_TITLE_OFFSET`=%d,",q->value(21).toInt())+
QString().sprintf("`TFC_TITLE_LENGTH`=%d,",q->value(22).toInt())+
QString().sprintf("`TFC_LEN_HOURS_OFFSET`=%d,",q->value(23).toInt())+
QString().sprintf("`TFC_LEN_HOURS_LENGTH`=%d,",q->value(24).toInt())+
QString().sprintf("`TFC_LEN_MINUTES_OFFSET`=%d,",q->value(25).toInt())+
QString().sprintf("`TFC_LEN_MINUTES_LENGTH`=%d,",q->value(26).toInt())+
QString().sprintf("`TFC_LEN_SECONDS_OFFSET`=%d,",q->value(27).toInt())+
QString().sprintf("`TFC_LEN_SECONDS_LENGTH`=%d,",q->value(28).toInt())+
QString().sprintf("`TFC_HOURS_OFFSET`=%d,",q->value(29).toInt())+
QString().sprintf("`TFC_HOURS_LENGTH`=%d,",q->value(30).toInt())+
QString().sprintf("`TFC_MINUTES_OFFSET`=%d,",q->value(31).toInt())+
QString().sprintf("`TFC_MINUTES_LENGTH`=%d,",q->value(32).toInt())+
QString().sprintf("`TFC_SECONDS_OFFSET`=%d,",q->value(33).toInt())+
QString().sprintf("`TFC_SECONDS_LENGTH`=%d,",q->value(34).toInt())+
QString().sprintf("`TFC_DATA_OFFSET`=%d,",q->value(35).toInt())+
QString().sprintf("`TFC_DATA_LENGTH`=%d,",q->value(36).toInt())+
QString().sprintf("`TFC_EVENT_ID_OFFSET`=%d,",q->value(37).toInt())+
QString().sprintf("`TFC_EVENT_ID_LENGTH`=%d,",q->value(38).toInt())+
QString().sprintf("`TFC_ANNC_TYPE_OFFSET`=%d,",q->value(39).toInt())+
QString().sprintf("`TFC_ANNC_TYPE_LENGTH`=%d,",q->value(40).toInt())+
QString::asprintf("`TFC_CART_OFFSET`=%d,",q->value(19).toInt())+
QString::asprintf("`TFC_CART_LENGTH`=%d,",q->value(20).toInt())+
QString::asprintf("`TFC_TITLE_OFFSET`=%d,",q->value(21).toInt())+
QString::asprintf("`TFC_TITLE_LENGTH`=%d,",q->value(22).toInt())+
QString::asprintf("`TFC_LEN_HOURS_OFFSET`=%d,",q->value(23).toInt())+
QString::asprintf("`TFC_LEN_HOURS_LENGTH`=%d,",q->value(24).toInt())+
QString::asprintf("`TFC_LEN_MINUTES_OFFSET`=%d,",q->value(25).toInt())+
QString::asprintf("`TFC_LEN_MINUTES_LENGTH`=%d,",q->value(26).toInt())+
QString::asprintf("`TFC_LEN_SECONDS_OFFSET`=%d,",q->value(27).toInt())+
QString::asprintf("`TFC_LEN_SECONDS_LENGTH`=%d,",q->value(28).toInt())+
QString::asprintf("`TFC_HOURS_OFFSET`=%d,",q->value(29).toInt())+
QString::asprintf("`TFC_HOURS_LENGTH`=%d,",q->value(30).toInt())+
QString::asprintf("`TFC_MINUTES_OFFSET`=%d,",q->value(31).toInt())+
QString::asprintf("`TFC_MINUTES_LENGTH`=%d,",q->value(32).toInt())+
QString::asprintf("`TFC_SECONDS_OFFSET`=%d,",q->value(33).toInt())+
QString::asprintf("`TFC_SECONDS_LENGTH`=%d,",q->value(34).toInt())+
QString::asprintf("`TFC_DATA_OFFSET`=%d,",q->value(35).toInt())+
QString::asprintf("`TFC_DATA_LENGTH`=%d,",q->value(36).toInt())+
QString::asprintf("`TFC_EVENT_ID_OFFSET`=%d,",q->value(37).toInt())+
QString::asprintf("`TFC_EVENT_ID_LENGTH`=%d,",q->value(38).toInt())+
QString::asprintf("`TFC_ANNC_TYPE_OFFSET`=%d,",q->value(39).toInt())+
QString::asprintf("`TFC_ANNC_TYPE_LENGTH`=%d,",q->value(40).toInt())+
"`MUS_PREIMPORT_CMD`='"+RDEscapeString(q->value(41).toString())+"',"+
"`MUS_IMPORT_TEMPLATE`='"+RDEscapeString(q->value(42).toString())+"',"+
"`MUS_PATH`='"+RDEscapeString(q->value(43).toString())+"',"+
@@ -1418,28 +1418,28 @@ bool RDSvc::create(const QString &name,QString *err_msg,
"`MUS_TRACK_CART`='"+RDEscapeString(q->value(45).toString())+"',"+
"`MUS_BREAK_STRING`='"+RDEscapeString(q->value(46).toString())+"',"+
"`MUS_TRACK_STRING`='"+RDEscapeString(q->value(47).toString())+"',"+
QString().sprintf("`MUS_CART_OFFSET`=%d,",q->value(48).toInt())+
QString().sprintf("`MUS_CART_LENGTH`=%d,",q->value(49).toInt())+
QString().sprintf("`MUS_TITLE_OFFSET`=%d,",q->value(50).toInt())+
QString().sprintf("`MUS_TITLE_LENGTH`=%d,",q->value(51).toInt())+
QString().sprintf("`MUS_LEN_HOURS_OFFSET`=%d,",q->value(52).toInt())+
QString().sprintf("`MUS_LEN_HOURS_LENGTH`=%d,",q->value(53).toInt())+
QString().sprintf("`MUS_LEN_MINUTES_OFFSET`=%d,",q->value(54).toInt())+
QString().sprintf("`MUS_LEN_MINUTES_LENGTH`=%d,",q->value(55).toInt())+
QString().sprintf("`MUS_LEN_SECONDS_OFFSET`=%d,",q->value(56).toInt())+
QString().sprintf("`MUS_LEN_SECONDS_LENGTH`=%d,",q->value(57).toInt())+
QString().sprintf("`MUS_HOURS_OFFSET`=%d,",q->value(58).toInt())+
QString().sprintf("`MUS_HOURS_LENGTH`=%d,",q->value(59).toInt())+
QString().sprintf("`MUS_MINUTES_OFFSET`=%d,",q->value(60).toInt())+
QString().sprintf("`MUS_MINUTES_LENGTH`=%d,",q->value(61).toInt())+
QString().sprintf("`MUS_SECONDS_OFFSET`=%d,",q->value(62).toInt())+
QString().sprintf("`MUS_SECONDS_LENGTH`=%d,",q->value(63).toInt())+
QString().sprintf("`MUS_DATA_OFFSET`=%d,",q->value(64).toInt())+
QString().sprintf("`MUS_DATA_LENGTH`=%d,",q->value(65).toInt())+
QString().sprintf("`MUS_EVENT_ID_OFFSET`=%d,",q->value(66).toInt())+
QString().sprintf("`MUS_EVENT_ID_LENGTH`=%d,",q->value(67).toInt())+
QString().sprintf("`MUS_ANNC_TYPE_OFFSET`=%d,",q->value(68).toInt())+
QString().sprintf("`MUS_ANNC_TYPE_LENGTH`=%d,",q->value(69).toInt())+
QString::asprintf("`MUS_CART_OFFSET`=%d,",q->value(48).toInt())+
QString::asprintf("`MUS_CART_LENGTH`=%d,",q->value(49).toInt())+
QString::asprintf("`MUS_TITLE_OFFSET`=%d,",q->value(50).toInt())+
QString::asprintf("`MUS_TITLE_LENGTH`=%d,",q->value(51).toInt())+
QString::asprintf("`MUS_LEN_HOURS_OFFSET`=%d,",q->value(52).toInt())+
QString::asprintf("`MUS_LEN_HOURS_LENGTH`=%d,",q->value(53).toInt())+
QString::asprintf("`MUS_LEN_MINUTES_OFFSET`=%d,",q->value(54).toInt())+
QString::asprintf("`MUS_LEN_MINUTES_LENGTH`=%d,",q->value(55).toInt())+
QString::asprintf("`MUS_LEN_SECONDS_OFFSET`=%d,",q->value(56).toInt())+
QString::asprintf("`MUS_LEN_SECONDS_LENGTH`=%d,",q->value(57).toInt())+
QString::asprintf("`MUS_HOURS_OFFSET`=%d,",q->value(58).toInt())+
QString::asprintf("`MUS_HOURS_LENGTH`=%d,",q->value(59).toInt())+
QString::asprintf("`MUS_MINUTES_OFFSET`=%d,",q->value(60).toInt())+
QString::asprintf("`MUS_MINUTES_LENGTH`=%d,",q->value(61).toInt())+
QString::asprintf("`MUS_SECONDS_OFFSET`=%d,",q->value(62).toInt())+
QString::asprintf("`MUS_SECONDS_LENGTH`=%d,",q->value(63).toInt())+
QString::asprintf("`MUS_DATA_OFFSET`=%d,",q->value(64).toInt())+
QString::asprintf("`MUS_DATA_LENGTH`=%d,",q->value(65).toInt())+
QString::asprintf("`MUS_EVENT_ID_OFFSET`=%d,",q->value(66).toInt())+
QString::asprintf("`MUS_EVENT_ID_LENGTH`=%d,",q->value(67).toInt())+
QString::asprintf("`MUS_ANNC_TYPE_OFFSET`=%d,",q->value(68).toInt())+
QString::asprintf("`MUS_ANNC_TYPE_LENGTH`=%d,",q->value(69).toInt())+
"`NAME`='"+RDEscapeString(name)+"'";
RDSqlQuery::apply(sql);
delete q;
@@ -1453,7 +1453,7 @@ bool RDSvc::create(const QString &name,QString *err_msg,
while(q->next()) {
sql=QString("insert into `SERVICE_CLOCKS` set ")+
"`SERVICE_NAME`='"+RDEscapeString(name)+"',"+
QString().sprintf("`HOUR`=%d,",q->value(0).toInt());
QString::asprintf("`HOUR`=%d,",q->value(0).toInt());
if(q->value(1).isNull()) {
sql+="`CLOCK_NAME`=null";
@@ -1508,7 +1508,7 @@ bool RDSvc::create(const QString &name,QString *err_msg,
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString("insert into `AUTOFILLS` set ")+
QString().sprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
QString::asprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
"`SERVICE`='"+RDEscapeString(name)+"'";
RDSqlQuery::apply(sql);
}
@@ -1614,7 +1614,7 @@ void RDSvc::remove(const QString &name)
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString("delete from `STACK_SCHED_CODES` where ")+
QString().sprintf("`STACK_LINES_ID`=%u",q->value(0).toUInt());
QString::asprintf("`STACK_LINES_ID`=%u",q->value(0).toUInt());
RDSqlQuery::apply(sql);
}
delete q;
@@ -1634,7 +1634,7 @@ void RDSvc::remove(const QString &name)
QString RDSvc::timeString(int hour,int secs)
{
return QString().sprintf("%02d:%02d:%02d",hour,secs/60,secs%60);
return QString::asprintf("%02d:%02d:%02d",hour,secs/60,secs%60);
}
@@ -1739,7 +1739,7 @@ void RDSvc::SetRow(const QString &param,int value) const
QString sql;
sql=QString("update `SERVICES` set `")+
param+QString().sprintf("`=%d where ",value)+
param+QString::asprintf("`=%d where ",value)+
"`NAME`='"+RDEscapeString(svc_name)+"'";
RDSqlQuery::apply(sql);
}
@@ -1794,7 +1794,7 @@ QString RDSvc::MakeErrorLine(int indent,unsigned lineno,const QString &msg)
for(int i=0;i<indent;i++) {
margin+=" ";
}
return margin+tr("Line")+QString().sprintf(" %u: ",1+lineno)+msg+"\n";
return margin+tr("Line")+QString::asprintf(" %u: ",1+lineno)+msg+"\n";
}
@@ -1824,12 +1824,12 @@ bool RDSvc::ResolveInlineEvents(const QString &logname,QString *err_msg)
"from `IMPORTER_LINES` where "+
"`IMPORTER_LINES`.`STATION_NAME`=\""+
RDEscapeString(svc_station->name())+"\" && "+
QString().sprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
QString().sprintf("`TYPE`=%u && ",RDLogLine::TrafficLink)+
QString().sprintf("`START_HOUR`=%d && ",start.hour())+
QString().sprintf("`START_SECS`>=%d && ",
QString::asprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
QString::asprintf("`TYPE`=%u && ",RDLogLine::TrafficLink)+
QString::asprintf("`START_HOUR`=%d && ",start.hour())+
QString::asprintf("`START_SECS`>=%d && ",
60*start.minute()+start.second())+
QString().sprintf("`START_SECS`<%d",60*start.minute()+start.second()+logline->linkLength()/1000);
QString::asprintf("`START_SECS`<%d",60*start.minute()+start.second()+logline->linkLength()/1000);
q=new RDSqlQuery(sql);
if(q->size()>1) {
*err_msg+=tr("In event")+" \""+logline->linkEventName()+"\"@"+
@@ -1845,8 +1845,8 @@ bool RDSvc::ResolveInlineEvents(const QString &logname,QString *err_msg)
sql=QString("update `IMPORTER_LINES` set ")+
"`LINK_START_TIME`='"+
logline->linkStartTime().toString("hh:mm:ss")+"',"+
QString().sprintf("`LINK_LENGTH`=%d where ",logline->linkLength())+
QString().sprintf("`ID`=%u",q->value(0).toUInt());
QString::asprintf("`LINK_LENGTH`=%d where ",logline->linkLength())+
QString::asprintf("`ID`=%u",q->value(0).toUInt());
RDSqlQuery::apply(sql);
}
delete q;
@@ -1871,10 +1871,10 @@ bool RDSvc::ResolveInlineEvents(const QString &logname,QString *err_msg)
"from `IMPORTER_LINES` where "+
"`IMPORTER_LINES`.`STATION_NAME`=\""+
RDEscapeString(svc_station->name())+"\" && "+
QString().sprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
QString().sprintf("((`TYPE`=%u) || ",RDLogLine::TrafficLink)+
QString().sprintf("(`TYPE`=%u) ||",RDLogLine::Marker)+
QString().sprintf("(`TYPE`=%u)) && ",RDLogLine::Track)+
QString::asprintf("`IMPORTER_LINES`.`PROCESS_ID`=%u && ",getpid())+
QString::asprintf("((`TYPE`=%u) || ",RDLogLine::TrafficLink)+
QString::asprintf("(`TYPE`=%u) ||",RDLogLine::Marker)+
QString::asprintf("(`TYPE`=%u)) && ",RDLogLine::Track)+
"(`START_HOUR` is null || `START_SECS` is null || `LENGTH` is null)";
ok=true;
q=new RDSqlQuery(sql);
@@ -1923,14 +1923,14 @@ bool RDSvc::ResolveInlineEvents(const QString &logname,QString *err_msg)
"`START_SECS`,"+ // 02
"`LENGTH` "+ // 03
"from `IMPORTER_LINES` where "+
QString().sprintf("`TYPE`=%u",RDLogLine::TrafficLink);
QString::asprintf("`TYPE`=%u",RDLogLine::TrafficLink);
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString("update `IMPORTER_LINES` set ")+
"`LINK_START_TIME`='"+QTime(q->value(1).toInt(),0,0).
addSecs(q->value(2).toInt()).toString("hh:mm:ss")+"',"+
QString().sprintf("`LINK_LENGTH`=%d where ",q->value(3).toInt())+
QString().sprintf("`ID`=%u",q->value(0).toUInt());
QString::asprintf("`LINK_LENGTH`=%d where ",q->value(3).toInt())+
QString::asprintf("`ID`=%u",q->value(0).toUInt());
RDSqlQuery::apply(sql);
}
delete q;