Ticket #2234: unicode.patch
File unicode.patch, 12.2 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/playgroup.cpp
28 28 QString nameTag(":WHERENAME"); 29 29 QString query("name = " + nameTag); 30 30 31 bindings.insert(nameTag, parent.getName() );31 bindings.insert(nameTag, parent.getName().utf8()); 32 32 33 33 return query; 34 34 } … … 147 147 else 148 148 { 149 149 while (query.next()) 150 names << query.value(0).toString();150 names << QString::fromUtf8(query.value(0).toString()); 151 151 } 152 152 153 153 return names; … … 163 163 " name = :CATEGORY OR " 164 164 " (titlematch <> '' AND " 165 165 " :TITLE REGEXP titlematch) "); 166 query.bindValue(":TITLE", pi->title );167 query.bindValue(":CATEGORY", pi->category );166 query.bindValue(":TITLE", pi->title.utf8()); 167 query.bindValue(":CATEGORY", pi->category.utf8()); 168 168 query.exec(); 169 169 170 170 if (!query.exec()) 171 171 MythContext::DBError("GetInitialName", query); 172 172 else if (query.next()) 173 res = query.value(0).toString();173 res = QString::fromUtf8(query.value(0).toString()); 174 174 175 175 return res; 176 176 } … … 186 186 " AND %2 <> 0 " 187 187 "ORDER BY name = 'Default';") 188 188 .arg(field).arg(field)); 189 query.bindValue(":NAME", name );189 query.bindValue(":NAME", name.utf8()); 190 190 if (!query.exec()) 191 191 MythContext::DBError("PlayGroup::GetSetting", query); 192 192 else if (query.next()) … … 217 217 218 218 MSqlQuery query(MSqlQuery::InitCon()); 219 219 query.prepare("INSERT INTO playgroup (name) VALUES (:NAME);"); 220 query.bindValue(":NAME", name );220 query.bindValue(":NAME", name.utf8()); 221 221 if (!query.exec()) 222 222 MythContext::DBError("PlayGroupEditor::open", query); 223 223 else … … 231 231 { 232 232 MSqlQuery query(MSqlQuery::InitCon()); 233 233 query.prepare("DELETE FROM playgroup WHERE name = :NAME;"); 234 query.bindValue(":NAME", name );234 query.bindValue(":NAME", name.utf8()); 235 235 if (!query.exec()) 236 236 MythContext::DBError("PlayGroupEditor::open", query); 237 237 } … … 255 255 { 256 256 MSqlQuery query(MSqlQuery::InitCon()); 257 257 query.prepare("DELETE FROM playgroup WHERE name = :NAME;"); 258 query.bindValue(":NAME", name );258 query.bindValue(":NAME", name.utf8()); 259 259 if (!query.exec()) 260 260 MythContext::DBError("PlayGroupEditor::doDelete", query); 261 261 -
libs/libmythtv/programinfo.cpp
3165 3165 generic = query.value(10).toInt(); 3166 3166 showtype = query.value(11).toString(); 3167 3167 colorcode = query.value(12).toString(); 3168 title_pronounce = query.value(13).toString();3168 title_pronounce = QString::fromUtf8(query.value(13).toString()); 3169 3169 } 3170 3170 else if (!query.isActive()) 3171 3171 MythContext::DBError("ProgramInfo::showDetails", query); … … 3266 3266 3267 3267 if (category != "") 3268 3268 { 3269 s = qApp->translate("Category", category);3269 s = category; 3270 3270 3271 3271 query.prepare("SELECT genre FROM programgenres " 3272 3272 "WHERE chanid = :CHANID AND starttime = :STARTTIME " -
libs/libmyth/settings.cpp
1425 1425 QString tagname(":SET" + column.upper()); 1426 1426 QString clause(column + " = " + tagname); 1427 1427 1428 bindings.insert(tagname, getValue() );1428 bindings.insert(tagname, getValue().utf8()); 1429 1429 1430 1430 return clause; 1431 1431 } … … 1480 1480 QString clause("value = " + valueTag + ", data = " + dataTag); 1481 1481 1482 1482 bindings.insert(valueTag, getName()); 1483 bindings.insert(dataTag, getValue() );1483 bindings.insert(dataTag, getValue().utf8()); 1484 1484 1485 1485 return clause; 1486 1486 } -
libs/libmyth/mythcontext.cpp
1720 1720 #if QT_VERSION >= 0x030200 1721 1721 str += "Query was:\n"; 1722 1722 str += query.executedQuery() + "\n"; 1723 str += DBErrorMessage(query.lastError());1723 str += QString::fromUtf8(DBErrorMessage(query.lastError())); 1724 1724 #else 1725 1725 str += "Your version of Qt is too old to provide proper debugging\n"; 1726 1726 str += "Query may have been:\n"; 1727 str += query.lastQuery() + "\n";1727 str += QString::fromUtf8(query.lastQuery()) + "\n"; 1728 1728 str += DBErrorMessage(query.lastError()); 1729 1729 #endif 1730 1730 VERBOSE(VB_IMPORTANT, str); -
programs/mythfrontend/playbackbox.cpp
4197 4197 { 4198 4198 while (query.next()) 4199 4199 { 4200 dispGroup = query.value(0).toString();4200 dispGroup = QString::fromUtf8(query.value(0).toString()); 4201 4201 items = query.value(1).toInt(); 4202 4202 itemStr = (items == 1) ? tr("item") : tr("items"); 4203 4203 dispGroup = (dispGroup == "Default") ? tr("Default") : dispGroup; … … 4235 4235 { 4236 4236 while (query.next()) 4237 4237 { 4238 dispGroup = query.value(0).toString();4238 dispGroup = QString::fromUtf8(query.value(0).toString()); 4239 4239 items = query.value(1).toInt(); 4240 4240 itemStr = (items == 1) ? tr("item") : tr("items"); 4241 4241 … … 4372 4372 MSqlQuery query(MSqlQuery::InitCon()); 4373 4373 query.prepare("SELECT password FROM recgrouppassword " 4374 4374 "WHERE recgroup = :GROUP ;"); 4375 query.bindValue(":GROUP", group );4375 query.bindValue(":GROUP", group.utf8()); 4376 4376 4377 4377 if (query.exec() && query.isActive() && query.size() > 0) 4378 4378 if (query.next()) … … 4397 4397 4398 4398 if (query.exec() && query.isActive() && query.size() > 0) 4399 4399 while (query.next()) 4400 recGroupPwCache[query.value(0).toString()] = 4400 { 4401 QString recgroup = QString::fromUtf8(query.value(0).toString()); 4402 recGroupPwCache[recgroup] = 4401 4403 query.value(1).toString(); 4404 } 4402 4405 } 4403 4406 4404 4407 void PlaybackBox::doPlaylistChangeRecGroup(void) … … 4441 4444 else 4442 4445 itemStr = tr("items"); 4443 4446 4444 dispGroup = query.value(0).toString();4447 dispGroup = QString::fromUtf8(query.value(0).toString()); 4445 4448 4446 4449 if (dispGroup == "Default") 4447 4450 dispGroup = tr("Default"); … … 4791 4794 4792 4795 query.prepare("DELETE FROM recgrouppassword " 4793 4796 "WHERE recgroup = :RECGROUP ;"); 4794 query.bindValue(":RECGROUP", recGroup );4797 query.bindValue(":RECGROUP", recGroup.utf8()); 4795 4798 4796 4799 query.exec(); 4797 4800 … … 4800 4803 query.prepare("INSERT INTO recgrouppassword " 4801 4804 "(recgroup, password) VALUES " 4802 4805 "( :RECGROUP , :PASSWD )"); 4803 query.bindValue(":RECGROUP", recGroup );4806 query.bindValue(":RECGROUP", recGroup.utf8()); 4804 4807 query.bindValue(":PASSWD", newPassword); 4805 4808 4806 4809 query.exec(); -
programs/mythfrontend/networkcontrol.cpp
792 792 { 793 793 while (query.next()) 794 794 { 795 if (query.value(3).toString() > " ") 795 QString title = QString::fromUtf8(query.value(2).toString()); 796 QString subtitle = QString::fromUtf8(query.value(3).toString()); 797 798 if (subtitle > " ") 796 799 episode = QString("%1 -\"%2\"") 797 .arg( query.value(2).toString().local8Bit())798 .arg( query.value(3).toString().local8Bit());800 .arg(title) 801 .arg(subtitle); 799 802 else 800 episode = query.value(2).toString().local8Bit();803 episode = title; 801 804 802 805 result += 803 806 QString("%1 %2 %3").arg(query.value(0).toInt()) -
programs/mythbackend/mainserver.cpp
1154 1154 1155 1155 proginfo->category = QString::fromUtf8(query.value(15).toString()); 1156 1156 1157 proginfo->recgroup = query.value(16).toString();1158 proginfo->playgroup = query.value(27).toString();1157 proginfo->recgroup = QString::fromUtf8(query.value(16).toString()); 1158 proginfo->playgroup = QString::fromUtf8(query.value(27).toString()); 1159 1159 1160 1160 proginfo->recpriority = query.value(36).toInt(); 1161 1161 -
programs/mythbackend/scheduler.cpp
2505 2506 2506 2507 proginfo->title = QString::fromUtf8(result.value(5).toString()); 2507 2508 proginfo->subtitle = 2508 2509 QString::fromUtf8(result.value(6).toString()); 2509 2510 proginfo->description = 2510 2511 QString::fromUtf8(result.value(7).toString()); 2511 2512 2512 2513 proginfo->recpriority = result.value(8).toInt(); 2513 proginfo->channame = QString::fromUtf8(result.value(10).toString()); 2514 proginfo->channame = 2515 QString::fromUtf8(result.value(10).toString()); 2514 2516 if (proginfo->channame.isNull()) 2515 2517 proginfo->channame = ""; 2516 proginfo->recgroup = result.value(12).toString(); 2517 proginfo->playgroup = result.value(22).toString(); 2518 proginfo->recgroup = 2519 QString::fromUtf8(result.value(12).toString()); 2520 proginfo->playgroup = 2521 QString::fromUtf8(result.value(22).toString()); 2518 2522 proginfo->dupin = RecordingDupInType(result.value(13).toInt()); 2519 2523 proginfo->dupmethod = 2520 2524 RecordingDupMethodType(result.value(14).toInt()); … … 2522 2526 proginfo->chanstr = result.value(16).toString(); 2523 2527 if (proginfo->chanstr.isNull()) 2524 2528 proginfo->chanstr = ""; 2525 proginfo->chansign = QString::fromUtf8(result.value(17).toString()); 2529 proginfo->chansign = 2530 QString::fromUtf8(result.value(17).toString()); 2526 2531 proginfo->seriesid = result.value(18).toString(); 2527 2532 proginfo->programid = result.value(19).toString(); 2528 proginfo->category = result.value(20).toString(); 2533 proginfo->category = 2534 QString::fromUtf8(result.value(20).toString()); 2529 2535 proginfo->findid = result.value(21).toInt(); 2530 2536 2531 2537 proginfo->recstartts = proginfo->startts; -
programs/mythtvosd/main.cpp
171 171 QString name = arg.section("=", 0, 0); 172 172 name.replace("--", ""); 173 173 174 QString value = arg.section("=", 1);174 QString value = QString::fromLocal8Bit(arg.section("=", 1)); 175 175 if (verbose) 176 176 { 177 177 178 cerr << "name: " << name << " -- value: " << value << endl; 178 cerr << "name: " << name 179 << " -- value: " << value.local8Bit() << endl; 179 180 } 180 181 181 182 name.append("%"); … … 185 186 } 186 187 187 188 if (verbose) 188 cout << "output:\n" << message << endl;189 cout << "output:\n" << message.local8Bit() << endl; 189 190 190 191 QSocketDevice sock(QSocketDevice::Datagram); 191 192