Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +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

14
rdrepld/citadelxds.cpp
View File

@@ -68,7 +68,7 @@ bool CitadelXds::processCart(const unsigned cartnum)
RDSqlQuery *q;
bool ret=false;
sql=QString().sprintf("select `FILENAME` from `ISCI_XREFERENCE` \
sql=QString::asprintf("select `FILENAME` from `ISCI_XREFERENCE` \
where (`CART_NUMBER`=%u)&&(`LATEST_DATE`>=now())&&\
((`TYPE`='R')||(`TYPE`='B'))",cartnum);
q=new RDSqlQuery(sql);
@@ -159,7 +159,7 @@ bool CitadelXds::LoadIsciXreference(const QString &filename)
if(ValidateFilename(fields[8])) {
if(date.isValid()) {
sql=QString("insert into `ISCI_XREFERENCE` set ")+
"`CART_NUMBER`="+QString().sprintf("%u",cartnum)+","+
"`CART_NUMBER`="+QString::asprintf("%u",cartnum)+","+
"`ISCI`='"+RDEscapeString(fields[4])+"',"+
"`FILENAME`='"+RDEscapeString(fields[8])+"',"+
"`LATEST_DATE`='"+date.toString("yyyy/MM/dd")+"',"+
@@ -268,7 +268,7 @@ void CitadelXds::CheckCarts()
"(`CUTS`.`ORIGIN_DATETIME`<`REPL_CART_STATE`.`ITEM_DATETIME`)&&"+
"(`REPL_CART_STATE`.`REPLICATOR_NAME`='"+
RDEscapeString(config()->name())+"')&&"+
QString().sprintf("(`REPL_CART_STATE`.`CART_NUMBER`=%u)&&",
QString::asprintf("(`REPL_CART_STATE`.`CART_NUMBER`=%u)&&",
q->value(0).toUInt())+
"(`REPL_CART_STATE`.`POSTED_FILENAME`='"+
RDEscapeString(q->value(1).toString())+"')&&"+
@@ -280,7 +280,7 @@ void CitadelXds::CheckCarts()
q->value(1).toString())) {
sql=QString("select `ID` from `REPL_CART_STATE` where ")+
"(`REPLICATOR_NAME`='"+RDEscapeString(config()->name())+"')&&"+
QString().sprintf("(`CART_NUMBER`=%u)&&",q->value(0).toUInt())+
QString::asprintf("(`CART_NUMBER`=%u)&&",q->value(0).toUInt())+
"(`POSTED_FILENAME`='"+RDEscapeString(q->value(1).toString())+"')";
q2=new RDSqlQuery(sql);
if(q2->first()) {
@@ -288,7 +288,7 @@ void CitadelXds::CheckCarts()
"`ITEM_DATETIME`=now(),"+
"`REPOST`='N' where "+
"(`REPLICATOR_NAME`='"+RDEscapeString(config()->name())+"')&&"+
QString().sprintf("(`CART_NUMBER`=%u)&&",q->value(0).toUInt())+
QString::asprintf("(`CART_NUMBER`=%u)&&",q->value(0).toUInt())+
"(`POSTED_FILENAME`='"+RDEscapeString(q->value(1).toString())+"')";
}
else {
@@ -296,7 +296,7 @@ void CitadelXds::CheckCarts()
"`ITEM_DATETIME`=now(),"+
"`REPOST`='N',"+
"`REPLICATOR_NAME`='"+RDEscapeString(config()->name())+"',"+
QString().sprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
QString::asprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
"`POSTED_FILENAME`='"+RDEscapeString(q->value(1).toString())+"'";
}
delete q2;
@@ -429,7 +429,7 @@ void CitadelXds::PurgeCuts()
config()->urlPassword(),"",false,
rda->config()->logXloadDebugData()))==
RDDelete::ErrorOk) {
sql=QString().sprintf("delete from `REPL_CART_STATE` where `ID`=%d",
sql=QString::asprintf("delete from `REPL_CART_STATE` where `ID`=%d",
q->value(0).toInt());
q2=new RDSqlQuery(sql);
delete q2;

6
rdrepld/rdrepld.cpp
View File

@@ -163,7 +163,7 @@ void MainObject::ProcessCarts()
"`ITEM_DATETIME` "+ // 01
"from `REPL_CART_STATE` where "+
"(`REPLICATOR_NAME`='"+RDEscapeString(repl_name)+"')&&"+
QString().sprintf("(`CART_NUMBER`=%u)",q->value(0).toUInt());
QString::asprintf("(`CART_NUMBER`=%u)",q->value(0).toUInt());
q1=new RDSqlQuery(sql);
if(q1->first()) {
stale=q->value(2).toDateTime()>q1->value(1).toDateTime();
@@ -176,12 +176,12 @@ void MainObject::ProcessCarts()
if(q1->isValid()) {
sql=QString("update `REPL_CART_STATE` set ")+
"`ITEM_DATETIME`=now() where "+
QString().sprintf("`ID`=%u",q1->value(0).toUInt());
QString::asprintf("`ID`=%u",q1->value(0).toUInt());
}
else {
sql=QString("insert into `REPL_CART_STATE` set ")+
"`REPLICATOR_NAME`='"+RDEscapeString(repl_name)+"',"+
QString().sprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
QString::asprintf("`CART_NUMBER`=%u,",q->value(0).toUInt())+
"`ITEM_DATETIME`=now()";
}
RDSqlQuery::apply(sql);