Index: scheduler.cpp =================================================================== --- scheduler.cpp (revision 10141) +++ scheduler.cpp (working copy) @@ -1786,12 +1786,7 @@ "program.manualid = 0 AND " "program.title = RECTABLE.title "); - while (1) - { - int i = s.find("RECTABLE"); - if (i == -1) break; - s = s.replace(i, strlen("RECTABLE"), recordTable); - } + s.replace(QString("RECTABLE"), recordTable); where << s; bindings[":NRST"] = kNoSearch; @@ -1882,12 +1877,7 @@ .arg(kTimeslotRecord) .arg(kWeekslotRecord); - while (1) - { - int i = query.find("RECTABLE"); - if (i == -1) break; - query = query.replace(i, strlen("RECTABLE"), recordTable); - } + query.replace(QString("RECTABLE"), recordTable); VERBOSE(VB_SCHEDULE, QString(" |-- Start DB Query %1...").arg(clause)); @@ -2092,12 +2082,7 @@ " ORDER BY RECTABLE.recordid DESC " ); - while (1) - { - int i = query.find("RECTABLE"); - if (i == -1) break; - query = query.replace(i, strlen("RECTABLE"), recordTable); - } + query.replace(QString("RECTABLE"), recordTable); VERBOSE(VB_SCHEDULE, QString(" |-- Start DB Query...")); @@ -2283,12 +2268,7 @@ .arg(kSingleRecord) .arg(kOverrideRecord); - while (1) - { - int i = query.find("RECTABLE"); - if (i == -1) break; - query = query.replace(i, strlen("RECTABLE"), recordTable); - } + query.replace(QString("RECTABLE"), recordTable); VERBOSE(VB_SCHEDULE, QString(" |-- Start DB Query...")); @@ -2375,12 +2355,7 @@ "GROUP BY recordid " "ORDER BY title ASC;"); - while (1) - { - int i = query.find("RECTABLE"); - if (i == -1) break; - query = query.replace(i, strlen("RECTABLE"), recordTable); - } + query.replace(QString("RECTABLE"), recordTable); MSqlQuery result(MSqlQuery::InitCon()); result.prepare(query);