diff --git a/ChangeLog b/ChangeLog index 71b9c86f..2c7971bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17331,3 +17331,6 @@ * Refactored rdcatchd(8) to remove arbitrary limits on number of control connections. * Removed Qt3 support classes from rdcatchd(8). +2018-08-08 Fred Gleason + * Modified all instances of 'QStringList::split()' calls to use + 'QString::split()'. diff --git a/cae/cae_jack.cpp b/cae/cae_jack.cpp index 6434f17f..daea3892 100644 --- a/cae/cae_jack.cpp +++ b/cae/cae_jack.cpp @@ -440,7 +440,7 @@ void MainObject::jackClientStartData() QString cmd=RDDateDecode(q->value(1).toString(),QDate::currentDate(), cae_station,rd_config, rd_config->provisioningServiceName(rd_config->stationName())); - QStringList fields=QStringList().split(" ",cmd); + QStringList fields=cmd.split(" "); jack_clients.push_back(new Q3Process(fields,this)); if(jack_clients.back()->start()) { rd_config->log("caed",RDConfig::LogDebug,"started JACK Client \""+ @@ -486,7 +486,7 @@ void MainObject::jackInit(RDStation *station) // Start Jack Server // if(station->startJack()) { - QStringList fields=QStringList().split(" ",station->jackCommandLine()); + QStringList fields=station->jackCommandLine().split(" "); Q3Process *proc=new Q3Process(fields,this); if(proc->start()) { rd_config->log("caed",RDConfig::LogDebug,"JACK server started"); diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index 94f591da..2659b66f 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -622,11 +622,11 @@ QDateTime MainObject::GetDateTime(const QString &str) const QStringList times; QDateTime ret; - fields=fields.split(" ",str); + fields=str.split(" "); if(fields.size()==2) { - dates=dates.split("/",fields[0]); + dates=fields[0].split("/"); if(dates.size()==3) { - times=times.split(":",fields[1]); + times=fields[1].split(":"); if(times.size()==3) { ret= QDateTime(QDate(dates[2].toInt(),dates[0].toInt(),dates[1].toInt()), @@ -640,7 +640,7 @@ QDateTime MainObject::GetDateTime(const QString &str) const QString MainObject::SwapCase(const QString &str) const { - QStringList parts=parts.split(".",str); + QStringList parts=str.split("."); if(parts[parts.size()-1].contains(QRegExp("*[a-z]*",true,true))>0) { parts[parts.size()-1]=parts[parts.size()-1].upper(); } diff --git a/lib/rdaudioinfo.cpp b/lib/rdaudioinfo.cpp index 3b738672..650c0186 100644 --- a/lib/rdaudioinfo.cpp +++ b/lib/rdaudioinfo.cpp @@ -250,12 +250,12 @@ int RDAudioInfo::ParseInt(const QString &tag,const QString &xml) // FIXME: This is totally ad-hoc, but should work until we settle on // a proper XML parser. // - QStringList list=list.split("\n",xml); + QStringList list=xml.split("\n"); for(int i=0;i=2) { - list2=list2.split(">",list2[1]); + list2=list2[i].split(">"); if(list2.size()>=2) { return list2[1].toInt(); } diff --git a/lib/rdaudiostore.cpp b/lib/rdaudiostore.cpp index 7e39cb19..d60e2443 100644 --- a/lib/rdaudiostore.cpp +++ b/lib/rdaudiostore.cpp @@ -198,12 +198,12 @@ uint64_t RDAudioStore::ParseInt(const QString &tag,const QString &xml) // FIXME: This is totally ad-hoc, but should work until we settle on // a proper XML parser. // - QStringList list=list.split("\n",xml); + QStringList list=xml.split("\n"); for(int i=0;i=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { return list2[1].toLongLong(); } diff --git a/lib/rdcae.cpp b/lib/rdcae.cpp index 66ee8a49..78da91b9 100644 --- a/lib/rdcae.cpp +++ b/lib/rdcae.cpp @@ -656,7 +656,7 @@ void RDCae::UpdateMeters() while((n=cae_meter_socket->readBlock(msg,1500))>0) { msg[n]=0; - args=args.split(" ",msg); + args=QString(msg).split(" "); if(args[0]=="ML") { if(args.size()==6) { if(args[1]=="I") { diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index fe43c13d..c7ceb10d 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -255,9 +255,8 @@ void RDCart::setAlbum(const QString &album) int RDCart::year() const { - QString value; - value=RDGetSqlValue("CART","NUMBER",cart_number,"YEAR").toString(); - QStringList f0=f0.split("-",value); + QStringList f0= + RDGetSqlValue("CART","NUMBER",cart_number,"YEAR").toString().split("-"); return f0[0].toInt(); } @@ -1491,7 +1490,7 @@ QString RDCart::xml(RDSqlQuery *q,bool include_cuts, break; case RDCart::Macro: - mlist=mlist.split("!",q->value(27).toString()); + mlist=q->value(27).toString().split("!"); if(mlist.size()==0) { xml+=" \n"; } @@ -1740,10 +1739,10 @@ unsigned RDCart::readXml(std::vector *data,const QString &xml) int istate=0; RDWaveData cartdata; RDSettings *settings=NULL; - QStringList f0=f0.split("\n",xml); + QStringList f0=xml.split("\n"); for(int i=0;i=4) { lookup_record->setDiscId(f0[2].toInt(&ok,16)); if(!ok) { diff --git a/lib/rdcmd_switch.cpp b/lib/rdcmd_switch.cpp index 5490089a..77ed3b24 100644 --- a/lib/rdcmd_switch.cpp +++ b/lib/rdcmd_switch.cpp @@ -47,7 +47,7 @@ RDCmdSwitch::RDCmdSwitch(int argc,char *argv[],const char *modname, if(value=="-d") { debug=true; } - QStringList f0=f0.split("=",value,true); + QStringList f0=value.split("="); if(f0.size()>=2) { switch_keys.push_back(f0[0]); for(int i=2;ireadLine(); - QStringList f0=f0.split(":",line); + QStringList f0=line.split(":"); if(f0.size()==2) { if(f0[0].lower()=="content-disposition") { - QStringList f1=f1.split(";",f0[1]); + QStringList f1=f0[1].split(";"); for(int i=0;ihardSortColumn())<0) { switch(list_parent->columnSortType(col)) { - case RDListView::TimeSort: - prev_length=RDSetTimeLength(i->text(col)); - length=RDSetTimeLength(text(col)); - if(lengthprev_length) { - return 1; - } - return 0; + case RDListView::TimeSort: + prev_length=RDSetTimeLength(i->text(col)); + length=RDSetTimeLength(text(col)); + if(lengthprev_length) { + return 1; + } + return 0; - case RDListView::LineSort: - if(line()<((RDListViewItem *)i)->line()) { - return -1; - } - if(line()>((RDListViewItem *)i)->line()) { - return 1; - } - return 0; + case RDListView::LineSort: + if(line()<((RDListViewItem *)i)->line()) { + return -1; + } + if(line()>((RDListViewItem *)i)->line()) { + return 1; + } + return 0; - case RDListView::GpioSort: - fields=fields.split("-",text(col)); - prev_fields=fields.split("-",i->text(col)); - if(fields[0].toInt()>prev_fields[0].toInt()) { - return 1; - } - if(fields[0].toInt()text(col).split("-"); + if(fields[0].toInt()>prev_fields[0].toInt()) { + return 1; + } + if(fields[0].toInt()audioStoreMountSource().isEmpty()) { // Audio store is local ret=true; while(fgets(line,1024,f)!=NULL) { - QStringList fields=fields.split(" ",QString(line)); + QStringList fields=QString(line).split(" "); if(fields.size()>=2) { ret=ret&&(fields[1]!=RD_AUDIO_ROOT); } @@ -52,7 +52,7 @@ bool RDAudioStoreValid(RDConfig *config) else { // Audio store is remote ret=false; while(fgets(line,1024,f)!=NULL) { - QStringList fields=fields.split(" ",QString(line)); + QStringList fields=QString(line).split(" "); if(fields.size()>=2) { ret=ret||fields[0]==config->audioStoreMountSource(); } diff --git a/lib/rdtrimaudio.cpp b/lib/rdtrimaudio.cpp index 38c1322e..6caac37d 100644 --- a/lib/rdtrimaudio.cpp +++ b/lib/rdtrimaudio.cpp @@ -230,12 +230,12 @@ bool RDTrimAudio::ParseXml(const QString &xml) // bool ret=false; - QStringList list=list.split("\n",xml); + QStringList list=xml.split("\n"); for(int i=0;i=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { conv_start_point=list2[1].toInt(); ret=true; @@ -254,12 +254,12 @@ int RDTrimAudio::ParsePoint(const QString &tag,const QString &xml) // FIXME: This is totally ad-hoc, but should work until we settle on // a proper XML parser. // - QStringList list=list.split("\n",xml); + QStringList list=xml.split("\n"); for(int i=0;i=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { return list2[1].toInt(); } diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp index f130da7b..5b0c9635 100644 --- a/lib/rdweb.cpp +++ b/lib/rdweb.cpp @@ -827,7 +827,7 @@ bool RDParsePost(std::map *vars) if(QString(data).stripWhiteSpace().isEmpty()) { if(!headers["content-disposition"].isNull()) { QStringList fields; - fields=fields.split(";",headers["content-disposition"]); + fields=headers["content-disposition"].split(";"); if(fields.size()>0) { if(fields[0].lower().stripWhiteSpace()=="form-data") { for(int i=1;i *vars) } else { QStringList hdr; - hdr=hdr.split(":",QString(data).stripWhiteSpace()); + hdr=QString(data).trimmed().split(":"); headers[hdr[0].lower()]=hdr[1]; } } @@ -1128,12 +1128,12 @@ QDateTime RDGetWebDateTime(const QString &str,bool *ok) *ok=false; } - f0=f0.split(" ",str.stripWhiteSpace()); + f0=str.trimmed().split(" "); switch(f0.size()) { case 1: // XML xs:dateTime Style - f1=f1.split("T",f0[0]); + f1=f0[0].split("T"); if(f1.size()<=2) { - f2=QStringList::split("-",f1[0]); + f2=f1[0].split("-"); if(f2.size()==3) { year=f2[0].toInt(&lok); if(lok&&(year>0)) { @@ -1158,7 +1158,7 @@ QDateTime RDGetWebDateTime(const QString &str,bool *ok) break; case 4: // RFC 850 Style - f1=f1.split("-",f0[1]); + f1=f0[1].split("-"); if(f1.size()==3) { month=RDGetWebMonth(f1[1],&lok); if(ok) { @@ -1247,18 +1247,18 @@ QTime RDGetWebTime(const QString &str,bool *ok) if(ok!=NULL) { *ok=false; } - f0=f0.split(" ",str.stripWhiteSpace()); + f0=str.trimmed().split(" "); switch(f0.size()) { case 1: // XML xs:time Style if(f0[0].right(1).lower()=="z") { // GMT tz=RDTimeZoneOffset(); f0[0]=f0[0].left(f0[0].length()-1); - f2=f2.split(":",f0[0]); + f2=f0[0].split(":"); } else { - f1=QStringList::split("+",f0[0]); + f1=f0[0].split("+"); if(f1.size()==2) { // GMT+ - f2=QStringList::split(":",f1[1]); + f2=f1[1].split(":"); if(f2.size()==2) { tztime=QTime(f2[0].toInt(),f2[1].toInt(),0); if(tztime.isValid()) { @@ -1267,9 +1267,9 @@ QTime RDGetWebTime(const QString &str,bool *ok) } } else { - f1=QStringList::split("-",f0[0]); + f1=f0[0].split("-"); if(f1.size()==2) { // GMT- - f2=QStringList::split(":",f1[1]); + f2=f1[1].split(":"); if(f2.size()==2) { tztime=QTime(f2[0].toInt(),f2[1].toInt(),0); if(tztime.isValid()) { @@ -1278,7 +1278,7 @@ QTime RDGetWebTime(const QString &str,bool *ok) } } } - f2=f2.split(":",f1[0]); + f2=f1[0].split(":"); } if(f2.size()==3) { time=QTime(f2[0].toInt(),f2[1].toInt(),f2[2].toInt()); @@ -1293,7 +1293,7 @@ QTime RDGetWebTime(const QString &str,bool *ok) case 2: // RFC Style if(f0[1].lower()=="gmt") { - f0=f0.split(":",f0[0]); + f0=f0[0].split(":"); if(f0.size()==3) { int hour=f0[0].toInt(&lok); if(lok) { diff --git a/lib/rdwebresult.cpp b/lib/rdwebresult.cpp index 2918e7eb..2f887bd2 100644 --- a/lib/rdwebresult.cpp +++ b/lib/rdwebresult.cpp @@ -101,31 +101,31 @@ bool RDWebResult::readXml(const QString &xml) // FIXME: This is totally ad-hoc, but should work until we settle on // a proper XML parser. // - QStringList list=list.split("\r\n",xml); + QStringList list=xml.split("\r\n"); for(int i=0;i=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { web_text=list2[1]; } } } if(list[i].contains("ResponseCode")) { - QStringList list2=list.split("<",list[i]); + QStringList list2=list[i].split("<"); if(list2.size()>=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { web_response_code=list2[1].toInt(); } } } if(list[i].contains("AudioConvertError")) { - QStringList list2=list.split("<",list[i]); + QStringList list2=list[i].split("<"); if(list2.size()>=2) { - list2=list2.split(">",list2[1]); + list2=list2[1].split(">"); if(list2.size()>=2) { web_converter_code=(RDAudioConvert::ErrorCode)list2[1].toInt(); } diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index b984b704..572569a9 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -1575,7 +1575,7 @@ int ListLog::PredictedStartHour(RDListViewItem *item) if(item==NULL) { return -1; } - QStringList item_fields=QStringList().split(":",item->text(1)); + QStringList item_fields=item->text(1).split(":"); if(item_fields.size()==3) { int item_hour=item_fields[0].replace("T","").toInt(&ok); if(ok) { diff --git a/rdcatch/edit_playout.cpp b/rdcatch/edit_playout.cpp index e5c75d98..f93b8e65 100644 --- a/rdcatch/edit_playout.cpp +++ b/rdcatch/edit_playout.cpp @@ -309,7 +309,7 @@ void EditPlayout::activateStationData(int id,bool use_temp) if(edit_station_box->currentText().isEmpty()) { return; } - QStringList f0=f0.split(":",edit_station_box->currentText()); + QStringList f0=edit_station_box->currentText().split(":"); if(edit_deck!=NULL) { delete edit_deck; } @@ -445,7 +445,7 @@ void EditPlayout::Save() QString EditPlayout::GetLocation(int *chan) const { - QStringList f0=f0.split(":",edit_station_box->currentText()); + QStringList f0=edit_station_box->currentText().split(":"); *chan= f0[1].stripWhiteSpace().left(f0[1].stripWhiteSpace().length()-1).toInt(); return f0[0].stripWhiteSpace(); diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index b6b01514..5da9fd5b 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -611,7 +611,7 @@ void EditRecording::activateStationData(int id,bool use_temp) return; } QString temp=edit_source_box->currentText(); - QStringList f0=f0.split(":",edit_station_box->currentText()); + QStringList f0=edit_station_box->currentText().split(":"); if(edit_deck!=NULL) { delete edit_deck; } @@ -1050,7 +1050,7 @@ bool EditRecording::CheckEvent(bool include_myself) // // sscanf((const char *)edit_station_box->currentText(),"%s%s%d", // station,gunk,&chan); - QStringList f0=f0.split(":",edit_station_box->currentText()); + QStringList f0=edit_station_box->currentText().split(":"); switch((RDRecording::StartType)edit_starttype_group->selectedId()) { case RDRecording::GpiStart: matrix=new RDMatrix(f0[0],edit_startmatrix_spin->value()); @@ -1184,8 +1184,8 @@ int EditRecording::GetSource() QString EditRecording::GetLocation(int *chan) const { - QStringList f0=f0.split(":",edit_station_box->currentText()); + QStringList f0=edit_station_box->currentText().split(":"); *chan= - f0[1].stripWhiteSpace().left(f0[1].stripWhiteSpace().length()-1).toInt(); - return f0[0].stripWhiteSpace(); + f0[1].trimmed().left(f0[1].trimmed().length()-1).toInt(); + return f0[0].trimmed(); } diff --git a/rdlibrary/list_reports.cpp b/rdlibrary/list_reports.cpp index 081700f5..28078e47 100644 --- a/rdlibrary/list_reports.cpp +++ b/rdlibrary/list_reports.cpp @@ -770,7 +770,7 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names) // Get max number of scheduler codes // while(q->next()) { - f0=f0.split(" ",q->value(17).toString()); + f0=q->value(17).toString().split(" "); if((int)f0.size()>code_quan) { code_quan=f0.size(); } @@ -883,7 +883,7 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names) *report+=QString().sprintf("%d,",q->value(30).toInt()); } - f0=f0.split(" ",q->value(31).toString()); + f0=q->value(31).toString().split(" "); for(int i=0;ii)&&(f0[i]!=".")) { *report+="\""+f0[i].stripWhiteSpace()+"\","; diff --git a/rdrepld/citadelxds.cpp b/rdrepld/citadelxds.cpp index c1386e3c..d1c1ca5f 100644 --- a/rdrepld/citadelxds.cpp +++ b/rdrepld/citadelxds.cpp @@ -153,7 +153,7 @@ bool CitadelXds::LoadIsciXreference(const QString &filename) } cartnum=fields[3].right(fields[3].length()-1).toUInt(&ok); if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) { - datelist=datelist.split("/",fields[6]); + datelist=fields[6].split("/"); if(datelist.size()==3) { date.setYMD(datelist[2].toInt()+2000,datelist[0].toInt(), datelist[1].toInt()); diff --git a/ripcd/btss41mlr.cpp b/ripcd/btss41mlr.cpp index 652ac9f5..261a71cb 100644 --- a/ripcd/btss41mlr.cpp +++ b/ripcd/btss41mlr.cpp @@ -191,7 +191,7 @@ void BtSs41Mlr::gpoOneshotData(int value) void BtSs41Mlr::ProcessStatus(const QString &msg) { - QStringList f0=f0.split(",",msg); + QStringList f0=msg.split(","); if(f0.size()==10) { if((f0[0]==QString().sprintf("S%dP",BTSS41MLR_UNIT_ID))&&(f0[1]=="A")) { diff --git a/ripcd/btu41mlrweb.cpp b/ripcd/btu41mlrweb.cpp index 52e51822..dcc141dc 100644 --- a/ripcd/btu41mlrweb.cpp +++ b/ripcd/btu41mlrweb.cpp @@ -177,7 +177,7 @@ void BtU41MlrWeb::ProcessCommand(const QString &cmd) { // syslog(LOG_NOTICE,"ProcessCommand(%s)\n",(const char *)cmd); - QStringList cmds=cmds.split(",",cmd); + QStringList cmds=cmd.split(","); if((cmds.size()==7)&&(cmds[0]=="S0P")) { for(int i=0;iaccum.toUtf8()); - QStringList cmds=cmds.split(" ",conn->accum); + QStringList cmds=conn->accum.split(" ",QString::SkipEmptyParts); // // Common Commands @@ -672,7 +672,8 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role, if(!macro.isNull()) { if(macro.command()==RDMacro::AG) { if(ripc_onair_flag) { - QStringList f0=f0.split(" ",QString::fromUtf8(buffer)); + QStringList f0= + QString::fromUtf8(buffer).split(" ",QString::SkipEmptyParts); f0.pop_front(); QString rmlstr=f0.join(" "); macro=RDMacro::fromString(rmlstr); diff --git a/ripcd/swauthority.cpp b/ripcd/swauthority.cpp index 5eb0f327..d53b95d5 100644 --- a/ripcd/swauthority.cpp +++ b/ripcd/swauthority.cpp @@ -305,7 +305,7 @@ void SoftwareAuthority::DispatchCommand() return; } swa_inputs++; - f0=f0.split("\t",line_in); + f0=line_in.split("\t",QString::KeepEmptyParts); name=f0[1]; if(f0.size()>=7) { name=f0[6]+": "+f0[2]; @@ -357,7 +357,7 @@ void SoftwareAuthority::DispatchCommand() return; } swa_outputs++; - f0=f0.split("\t",line_in); + f0=line_in.split("\t",QString::KeepEmptyParts); name=f0[1]; if(f0.size()>=6) { name=f0[3]+"/"+f0[5]+": "+f0[2]; @@ -400,7 +400,7 @@ void SoftwareAuthority::DispatchCommand() // // GPIO State Parser // - f0=f0.split(" ",section); + f0=section.split(" "); if((f0.size()==4)&&(f0[0].lower()=="gpistat")&&(f0[1].toInt()==swa_card)) { if(swa_gpi_states[f0[2].toInt()].isEmpty()) { swa_gpi_states[f0[2].toInt()]=f0[3]; diff --git a/ripcd/wheatnet_lio.cpp b/ripcd/wheatnet_lio.cpp index 0b4ecef9..cb93e3ea 100644 --- a/ripcd/wheatnet_lio.cpp +++ b/ripcd/wheatnet_lio.cpp @@ -1,8 +1,8 @@ // wheatnet_lio.cpp // -// A Rivendell switcher driver for Modbus TCP +// A Rivendell switcher driver for WheatNet LIO // -// (C) Copyright 2017 Fred Gleason +// (C) Copyright 2017-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -282,7 +282,7 @@ void WheatnetLio::ProcessSys(const QString &cmd) RDSqlQuery *q; bool ok=false; - QStringList f0=f0.split(":",cmd); + QStringList f0=cmd.split(":"); if((f0[0]=="LIO")&&(f0.size()==2)) { int lio=f0[1].toUInt(&ok); if(ok) { @@ -324,7 +324,7 @@ void WheatnetLio::ProcessSys(const QString &cmd) void WheatnetLio::ProcessLioevent(int chan,QString &cmd) { // printf("ProcessLioevent(%d,%s)\n",chan,(const char *)cmd); - QStringList f0=f0.split(":",cmd); + QStringList f0=cmd.split(":"); if((f0[0]=="LVL")&&(f0.size()==2)) { if(chan<(int)lio_gpi_states.size()) { bool state=f0[1]=="1"; @@ -353,14 +353,14 @@ void WheatnetLio::ProcessCommand(const QString &cmd) bool ok=false; if((cmd.left(1)=="<")&&(cmd.right(1)==">")) { - QStringList f0=f0.split("|",cmd.mid(1,cmd.length()-2)); + QStringList f0=cmd.mid(1,cmd.length()-2).split("|"); if(f0.size()==2) { - QStringList f1=f1.split(":",f0[0]); + QStringList f1=f0[0].split(":"); if(f1[0]=="SYS") { ProcessSys(f0[1]); } if((f1[0]=="LIOEVENT")&&(f1.size()==2)) { - QStringList f2=f2.split(".",f1[1]); + QStringList f2=f1[1].split("."); if((f2[0]=="0")&&(f2.size()==2)) { int chan=f2[1].toUInt(&ok); if(ok) { diff --git a/ripcd/wheatnet_slio.cpp b/ripcd/wheatnet_slio.cpp index 23764c43..83995abb 100644 --- a/ripcd/wheatnet_slio.cpp +++ b/ripcd/wheatnet_slio.cpp @@ -1,8 +1,8 @@ // wheatnet_slio.cpp // -// A Rivendell switcher driver for Modbus TCP +// A Rivendell switcher driver for WheatNet SLIO // -// (C) Copyright 2017 Fred Gleason +// (C) Copyright 2017-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -279,7 +279,7 @@ void WheatnetSlio::ProcessSys(const QString &cmd) RDSqlQuery *q; bool ok=false; - QStringList f0=f0.split(":",cmd); + QStringList f0=cmd.split(":"); if((f0[0]=="SLIO")&&(f0.size()==2)) { int slio=f0[1].toUInt(&ok); if(ok) { @@ -321,7 +321,7 @@ void WheatnetSlio::ProcessSys(const QString &cmd) void WheatnetSlio::ProcessSlioevent(int chan,QString &cmd) { // printf("ProcessSlip(%d,%s)\n",chan,(const char *)cmd); - QStringList f0=f0.split(":",cmd); + QStringList f0=cmd.split(":"); if((f0[0]=="LVL")&&(f0.size()==2)) { if(chan<=(int)slio_gpi_states.size()) { bool state=f0[1]=="1"; @@ -351,9 +351,9 @@ void WheatnetSlio::ProcessCommand(const QString &cmd) bool ok=false; if((cmd.left(1)=="<")&&(cmd.right(1)==">")) { - QStringList f0=f0.split("|",cmd.mid(1,cmd.length()-2)); + QStringList f0=cmd.mid(1,cmd.length()-2).split("|"); if(f0.size()==2) { - QStringList f1=f1.split(":",f0[0]); + QStringList f1=f0[0].split(":"); if(f1[0]=="SYS") { ProcessSys(f0[1]); } diff --git a/tests/mcast_recv_test.cpp b/tests/mcast_recv_test.cpp index 9f34b2f2..fcfdf500 100644 --- a/tests/mcast_recv_test.cpp +++ b/tests/mcast_recv_test.cpp @@ -41,7 +41,7 @@ MainObject::MainObject(QObject *parent) MCAST_RECV_TEST_USAGE); for(unsigned i=0;ikeys();i++) { if(cmd->key(i)=="--from") { - QStringList f0=f0.split(":",cmd->value(i)); + QStringList f0=cmd->value(i).split(":"); if(f0.size()!=2) { fprintf(stderr,"mcast_recv_test: invalid argument to \"--from\"\n"); exit(1); diff --git a/utils/rdalsaconfig/rdalsa.cpp b/utils/rdalsaconfig/rdalsa.cpp index 3952a9ac..fa31a356 100644 --- a/utils/rdalsaconfig/rdalsa.cpp +++ b/utils/rdalsaconfig/rdalsa.cpp @@ -229,7 +229,7 @@ bool RDAlsa::LoadAsoundConfig(const QString &filename) break; case 1: - list=list.split(" ",str); + list=str.split(" "); if(list[0]=="}") { if((port>=0)&&(portfirst()) { - QStringList f0=f0.split("!",q->value(0).toString()); + QStringList f0=q->value(0).toString().split("!"); if(f0.size()==2) { if(f0[0]=="SP") { len+=f0[1].toInt(); diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 7f3acf1a..d80054bb 100644 --- a/utils/rddgimport/rddgimport.cpp +++ b/utils/rddgimport/rddgimport.cpp @@ -574,7 +574,7 @@ QTime MainWidget::GetTime(const QString &str) const QTime ret; bool ok=false; - fields=fields.split(":",str); + fields=str.split(":"); if(fields.size()==3) { int hour=fields[0].toInt(&ok); if(ok&&(hour>=0)&&(hour<=23)) { diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index 85716635..f897a552 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -85,7 +85,7 @@ MainObject::MainObject(QObject *parent) if(rda->cmdSwitch()->key(i)=="--carts") { bool ok=false; bool valid=false; - QStringList f0=f0.split(":",rda->cmdSwitch()->value(i)); + QStringList f0=rda->cmdSwitch()->value(i).split(":"); if(f0.size()==2) { int start=f0[0].toUInt(&valid); if(valid&&(start>0)&&(valid<=RD_MAX_CART_NUMBER)) { @@ -430,11 +430,11 @@ void MainObject::ExportCut(RDCart *cart,RDCut *cut) if((export_err=conv->runExport(rda->user()->name(),rda->user()->password(), &conv_err))==RDAudioExport::ErrorOk) { - QStringList f0=f0.split("/",conv->destinationFile()); + QStringList f0=conv->destinationFile().split("/"); printf("%s\n",(const char *)f0[f0.size()-1]); if(export_xml) { FILE *f=NULL; - f0=f0.split(".",conv->destinationFile(),true); + f0=conv->destinationFile().split(".",QString::KeepEmptyParts); QString filename; for(int i=0;icmdSwitch()->setProcessed(i,true); } if(rda->cmdSwitch()->key(i)=="--set-datetimes") { - QStringList f0=QStringList().split(",",rda->cmdSwitch()->value(i)); + QStringList f0=rda->cmdSwitch()->value(i).split(","); if(f0.size()!=2) { fprintf(stderr,"rdimport: invalid argument to --set-datetimes\n"); exit(2); @@ -236,7 +236,7 @@ MainObject::MainObject(QObject *parent) rda->cmdSwitch()->setProcessed(i,true); } if(rda->cmdSwitch()->key(i)=="--set-daypart-times") { - QStringList f0=QStringList().split(",",rda->cmdSwitch()->value(i)); + QStringList f0=rda->cmdSwitch()->value(i).split(","); if(f0.size()!=2) { fprintf(stderr,"rdimport: invalid argument to --set-daypart-times\n"); exit(2); @@ -1985,7 +1985,7 @@ void MainObject::ReadXmlFile(const QString &basename,RDWaveData *wavedata) const // // Get XML Filename // - QStringList f0=f0.split(".",basename); + QStringList f0=basename.split("."); for(int i=0;icmdSwitch()->setProcessed(i,true); } if(rda->cmdSwitch()->key(i)=="--to-cart") { - QStringList f0=f0.split(":",rda->cmdSwitch()->value(i)); + QStringList f0=rda->cmdSwitch()->value(i).split(":"); if(f0.size()!=2) { fprintf(stderr,"rdrender: invalid --to-cart argument\n"); exit(1); diff --git a/web/rdfeed/rdfeed_script.cpp b/web/rdfeed/rdfeed_script.cpp index e6822e8e..44ea1b8d 100644 --- a/web/rdfeed/rdfeed_script.cpp +++ b/web/rdfeed/rdfeed_script.cpp @@ -336,7 +336,7 @@ QString MainObject::ResolveItemWildcards(const QString &keyname, bool MainObject::ShouldCount(const QString &hdr) { bool ret=false; - QStringList lines=QStringList::split("\n",hdr); + QStringList lines=hdr.split("\n"); int n; QString str;