Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-08 08:27:45 +02:00
Code Issues Projects Releases Wiki Activity

2018-08-08 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified all instances of 'QStringList::split()' calls to use
	'QString::split()'.
This commit is contained in:
Fred Gleason 2018-08-08 18:11:23 -04:00
parent e3bb963c3f
commit 8d11616b4b
44 changed files with 145 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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 <fredg@paravelsystems.com>
* Modified all instances of 'QStringList::split()' calls to use
'QString::split()'.

4
cae/cae_jack.cpp
View File

@ -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");

8
importers/nexgen_filter.cpp
View File

@ -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();
}

6
lib/rdaudioinfo.cpp
View File

@ -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<list.size();i++) {
if(list[i].contains(tag)) {
QStringList list2=list.split("<",list[i]);
QStringList list2=list[i].split("<");
if(list2.size()>=2) {
list2=list2.split(">",list2[1]);
list2=list2[i].split(">");
if(list2.size()>=2) {
return list2[1].toInt();
}

6
lib/rdaudiostore.cpp
View File

@ -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<list.size();i++) {
if(list[i].contains(tag)) {
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) {
return list2[1].toLongLong();
}

2
lib/rdcae.cpp
View File

@ -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") {

11
lib/rdcart.cpp
View File

@ -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+=" <macroList/>\n";
}
@ -1740,10 +1739,10 @@ unsigned RDCart::readXml(std::vector<RDWaveData> *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<f0.size();i++) {
f0[i]=f0[i].stripWhiteSpace();
f0[i]=f0[i].trimmed();
}
for(int i=0;i<f0.size();i++) {

2
lib/rdcddblookup.cpp
View File

@ -173,7 +173,7 @@ void RDCddbLookup::readyReadData()
case 2: // Query Response
switch(code) {
case 200: // Exact Match
f0=f0.split(" ",line,true);
f0=line.split(" ");
if(f0.size()>=4) {
lookup_record->setDiscId(f0[2].toInt(&ok,16));
if(!ok) {

2
lib/rdcmd_switch.cpp
View File

@ -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;i<f0.size();i++) {

4
lib/rdconf.cpp
View File

@ -1103,8 +1103,8 @@ bool RDProcessActive(const QStringList &cmds)
if(ok) {
if((f=fopen(QString("/proc/")+dirs[i]+"/cmdline","r"))!=NULL) {
if(fgets(line,1024,f)!=NULL) {
QStringList f1=f1.split(" ",QString(line));
QStringList f2=f2.split("/",f1[0]);
QStringList f1=QString(line).split(" ",QString::SkipEmptyParts);
QStringList f2=f1[0].split("/",QString::SkipEmptyParts);
cmdline=f2[f2.size()-1];
for(int j=0;j<cmds.size();j++) {
if(cmdline==cmds[j]) {

2
lib/rdconfig.cpp
View File

@ -524,7 +524,7 @@ void RDConfig::load()
strcpy(sname,"windows");
#else
gethostname(sname,255);
QStringList list=list.split(".",sname); // Strip domain name parts
QStringList list=QString(sname).split("."); // Strip domain name parts
strncpy(sname,list[0],256);
#endif
conf_station_name=

4
lib/rdcut.cpp
View File

@ -1201,7 +1201,7 @@ bool RDCut::checkInRecording(const QString &station_name,
//
if(addr.setAddress(src_hostname)) {
if(addr.isIPv4Address()) {
QStringList f0=f0.split(".",addr.toString());
QStringList f0=addr.toString().split(".");
if(f0[0]=="127") {
src_hostname=station_name;
}
@ -1215,7 +1215,7 @@ bool RDCut::checkInRecording(const QString &station_name,
}
}
if(addr.isIPv6Address()) {
QStringList f0=f0.split(":",addr.toString());
QStringList f0=addr.toString().split(":");
if(f0.back()=="1") {
src_hostname=station_name;
}

10
lib/rdformpost.cpp
View File

@ -483,9 +483,9 @@ void RDFormPost::LoadUrlEncoding(char first)
}
post_data[post_content_length]=0;
lines=lines.split("&",post_data);
lines=QString(post_data).split("&");
for(int i=0;i<lines.size();i++) {
line=line.split("=",lines[i]);
line=lines[i].split("=");
switch(line.size()) {
case 1:
post_values[line[0]]="";
@ -561,12 +561,12 @@ bool RDFormPost::GetMimePart(QString *name,QString *value,bool *is_file)
//
do {
line=post_text_reader->readLine();
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;i<f1.size();i++) {
QStringList f2=f2.split("=",f1[i].stripWhiteSpace());
QStringList f2=f1[i].trimmed().split("=");
if(f2.size()==2) {
if(f2[0]=="name") {
*name=f2[1].replace("\"","");

62
lib/rdlistviewitem.cpp
View File

@ -163,39 +163,39 @@ int RDListViewItem::compare(Q3ListViewItem *i,int col,bool ascending) const
if((hard_column=list_parent->hardSortColumn())<0) {
switch(list_parent->columnSortType(col)) {
case RDListView::TimeSort:
prev_length=RDSetTimeLength(i->text(col));
length=RDSetTimeLength(text(col));
if(length<prev_length) {
return -1;
}
if(length>prev_length) {
return 1;
}
return 0;
case RDListView::TimeSort:
prev_length=RDSetTimeLength(i->text(col));
length=RDSetTimeLength(text(col));
if(length<prev_length) {
return -1;
}
if(length>prev_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()<prev_fields[0].toInt()) {
return -1;
}
return 0;
case RDListView::NormalSort:
return Q3ListViewItem::compare(i,col,ascending);
case RDListView::GpioSort:
fields=text(col).split("-");
prev_fields=i->text(col).split("-");
if(fields[0].toInt()>prev_fields[0].toInt()) {
return 1;
}
if(fields[0].toInt()<prev_fields[0].toInt()) {
return -1;
}
return 0;
case RDListView::NormalSort:
return Q3ListViewItem::compare(i,col,ascending);
}
}
if(ascending) {

2
lib/rdmacro.cpp
View File

@ -215,7 +215,7 @@ RDMacro RDMacro::fromString(const QString &str,RDMacro::Role role)
//
// Get Command
//
QStringList f0=f0.split(" ",str2.left(str2.length()-1).stripWhiteSpace());
QStringList f0=str2.left(str2.length()-1).trimmed().split(" ");
if(f0[0].length()!=2) {
ret.setCommand(RDMacro::NN);
return ret;

2
lib/rdnotification.cpp
View File

@ -85,7 +85,7 @@ bool RDNotification::read(const QString &str)
notify_action=RDNotification::NoAction;
notify_id=QVariant();
QStringList args=args.split(" ",str);
QStringList args=str.split(" ");
if(args.size()==4) {
if(args[0]!="NOTIFY") {
return false;

2
lib/rdprofile.cpp
View File

@ -82,7 +82,7 @@ void RDProfile::setSourceString(const QString &str)
profile_section.resize(0);
profile_section.push_back(RDProfileSection());
profile_section.back().setName("");
lines=lines.split("\n",str);
lines=str.split("\n");
for(int i=0;i<lines.size();i++) {
QString line=lines[i];
if((line.left(1)!=";")&&(line.left(1)!="#")) {

8
lib/rdrenderer.cpp
View File

@ -217,7 +217,7 @@ bool __RDRenderLogLine::GetCutFile(const QString &cutname,int start_pt,
void __RDRenderLogLine::DeleteCutFile(const QString &dest_filename) const
{
unlink(dest_filename);
QStringList f0=f0.split("/",dest_filename);
QStringList f0=dest_filename.split("/");
f0.erase(f0.fromLast());
rmdir("/"+f0.join("/"));
}
@ -234,10 +234,6 @@ uint64_t __RDRenderLogLine::FramesFromMsec(uint64_t msec)
RDRenderer::RDRenderer(QObject *parent)
: QObject(parent)
{
// render_user=user;
// render_station=station;
// render_system=system;
// render_config=config;
render_total_passes=0;
}
@ -619,7 +615,7 @@ bool RDRenderer::ImportCart(const QString &srcfile,unsigned cartnum,int cutnum,
void RDRenderer::DeleteTempFile(const QString &filename) const
{
unlink(filename);
QStringList f0=f0.split("/",filename);
QStringList f0=filename.split("/");
f0.erase(f0.fromLast());
rmdir("/"+f0.join("/"));
}

2
lib/rdripc.cpp
View File

@ -239,7 +239,7 @@ void RDRipc::DispatchCommand()
QString str;
// printf("RDRipc::DispatchCommand: %s\n",(const char *)ripc_accum.toUtf8());
QStringList cmds=cmds.split(" ",ripc_accum);
QStringList cmds=ripc_accum.split(" ",QString::SkipEmptyParts);
if(cmds[0]=="PW") { // Password Response
SendCommand("RU!");

4
lib/rdstatus.cpp
View File

@ -43,7 +43,7 @@ bool RDAudioStoreValid(RDConfig *config)
if(config->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();
}

12
lib/rdtrimaudio.cpp
View File

@ -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<list.size();i++) {
if(list[i].contains("startTrimPoint")) {
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) {
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<list.size();i++) {
if(list[i].contains(tag)) {
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) {
return list2[1].toInt();
}

28
lib/rdweb.cpp
View File

@ -827,7 +827,7 @@ bool RDParsePost(std::map<QString,QString> *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<fields.size();i++) {
@ -856,7 +856,7 @@ bool RDParsePost(std::map<QString,QString> *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) {

14
lib/rdwebresult.cpp
View File

@ -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<list.size();i++) {
//printf("%d: %s\n",i,(const char *)list[i]);
if(list[i].contains("ErrorString")) {
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_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();
}

2
rdairplay/list_log.cpp
View File

@ -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) {

4
rdcatch/edit_playout.cpp
View File

@ -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();

10
rdcatch/edit_recording.cpp
View File

@ -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();
}

4
rdlibrary/list_reports.cpp
View File

@ -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;i<code_quan;i++) {
if(((int)f0.size()>i)&&(f0[i]!=".")) {
*report+="\""+f0[i].stripWhiteSpace()+"\",";

2
rdrepld/citadelxds.cpp
View File

@ -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());

2
ripcd/btss41mlr.cpp
View File

@ -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")) {

2
ripcd/btu41mlrweb.cpp
View File

@ -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;i<BTU41MLRWEB_GPI_QUAN;i++) {

2
ripcd/harlond.cpp
View File

@ -260,7 +260,7 @@ void Harlond::watchdogTimeoutData()
void Harlond::ProcessResponse(const QString &str)
{
// LogLine(RDConfig::LogNotice,str);
QStringList cmds=cmds.split(" ",str);
QStringList cmds=str.split(" ");
if(cmds[0]=="PW") {
if(cmds.size()==2) {

5
ripcd/ripcd.cpp
View File

@ -483,7 +483,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
QHostAddress addr;
//printf("DispatchCommand(%s)\n",(const char *)conn->accum.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);

6
ripcd/swauthority.cpp
View File

@ -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];

14
ripcd/wheatnet_lio.cpp
View File

@ -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 <fredg@paravelsystems.com>
// (C) Copyright 2017-2018 Fred Gleason <fredg@paravelsystems.com>
//
// 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) {

12
ripcd/wheatnet_slio.cpp
View File

@ -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 <fredg@paravelsystems.com>
// (C) Copyright 2017-2018 Fred Gleason <fredg@paravelsystems.com>
//
// 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]);
}

2
tests/mcast_recv_test.cpp
View File

@ -41,7 +41,7 @@ MainObject::MainObject(QObject *parent)
MCAST_RECV_TEST_USAGE);
for(unsigned i=0;i<cmd->keys();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);

2
utils/rdalsaconfig/rdalsa.cpp
View File

@ -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)&&(port<RD_MAX_CARDS)) {
card_rivendell_cards[port]=card;

2
utils/rdclilogedit/parser.cpp
View File

@ -40,7 +40,7 @@ void MainObject::DispatchCommand(QString cmd)
overwrite=true;
cmd=cmd.left(cmd.length()-1).stripWhiteSpace();
}
cmds=cmds.split(" ",cmd);
cmds=cmd.split(" ",QString::SkipEmptyParts);
verb=cmds[0].lower();
//

2
utils/rddbmgr/updateschema.cpp
View File

@ -7974,7 +7974,7 @@ void MainObject::TotalMacros89(unsigned cartnum) const
QString().sprintf("NUMBER=%d",cartnum);
RDSqlQuery *q=new RDSqlQuery(sql,false);
if(q->first()) {
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();

2
utils/rddgimport/rddgimport.cpp
View File

@ -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)) {

6
utils/rdexport/rdexport.cpp
View File

@ -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;i<f0.size()-1;i++) {
filename+=f0[i]+".";

6
utils/rdimport/rdimport.cpp
View File

@ -183,7 +183,7 @@ MainObject::MainObject(QObject *parent)
rda->cmdSwitch()->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;i<f0.size()-1;i++) {
xmlname+=f0[i]+".";
}

2
utils/rdrender/rdrender.cpp
View File

@ -208,7 +208,7 @@ MainObject::MainObject(QObject *parent)
rda->cmdSwitch()->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);

2
web/rdfeed/rdfeed_script.cpp
View File

@ -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;