diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/carddatabasemodel.cpp index 0a5574d24..f03ac9490 100644 --- a/cockatrice/src/carddatabasemodel.cpp +++ b/cockatrice/src/carddatabasemodel.cpp @@ -145,14 +145,15 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex return false; if (!cardSet.isEmpty()) { - bool blnGood = false; - for(int intLoop = 0; intLoop < info->getSets().count(); intLoop++) { - if (info->getSets().at(intLoop)->getShortName() == cardSet) { - blnGood = true; + int iCount = info->getSets().count(); + bool isValidSet = false; + for(int iLoop = 0; iLoop < iCount; iLoop++) { + if (info->getSets().at(iLoop)->getShortName() == cardSet) { + isValidSet = true; break; } } - if (!blnGood) { + if (!isValidSet) { return false; } } diff --git a/cockatrice/src/dlg_cardsearch.cpp b/cockatrice/src/dlg_cardsearch.cpp index 5b9d71b52..f2a2e3784 100644 --- a/cockatrice/src/dlg_cardsearch.cpp +++ b/cockatrice/src/dlg_cardsearch.cpp @@ -36,9 +36,10 @@ DlgCardSearch::DlgCardSearch(QWidget *parent) cboSetList->addItem(""); SetList setList = db->getSetList(); setList.sortByName(); - for (int intLoop = 0; intLoop < setList.size(); ++intLoop) { + int iCount = setList.size(); + for (int iLoop = 0; iLoop < iCount; ++iLoop) { //Adding Translated Set Name, Just In Case - cboSetList->addItem(tr("%1").arg(setList.at(intLoop)->getLongName()), setList.at(intLoop)->getShortName()); + cboSetList->addItem(setList.at(iLoop)->getLongName(), setList.at(iLoop)->getShortName()); } QLabel *cardTypesLabel = new QLabel(tr("Card type (OR):")); diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts index 227fe3e28..63621fe7f 100644 --- a/cockatrice/translations/cockatrice_cs.ts +++ b/cockatrice/translations/cockatrice_cs.ts @@ -1081,37 +1081,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: Jméno karty: - + Card text: Text karty: - + + Card Set (AND): + + + + Card type (OR): Typ karty (NEBO): - + Color (OR): Barva (NEBO): - + O&K O&K - + &Cancel &Cancel - + Card search Hledat kartu diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index d1e6bf019..a60c99f09 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -1424,37 +1424,42 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic DlgCardSearch - + Card name: Kartenname: - + Card text: Kartentext: - + + Card Set (AND): + + + + Card type (OR): Kartentyp (ODER): - + Color (OR): Farbe (ODER): - + O&K O&K - + &Cancel &Abbrechen - + Card search Kartensuche diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index fa07e0130..b18a5bd1d 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: - + Card text: - + + Card Set (AND): + + + + Card type (OR): - + Color (OR): - + O&K - + &Cancel - + Card search diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index 91e74900c..a7c1fe27d 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -1340,37 +1340,42 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona DlgCardSearch - + Card name: Nombre de la carta: - + Card text: Texto de la carta: - + + Card Set (AND): + + + + Card type (OR): Tipo de la carta (OR): - + Color (OR): Color (OR): - + O&K &Aceptar - + &Cancel &Cancelar - + Card search Buscar carta diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts index db9573359..da017c684 100644 --- a/cockatrice/translations/cockatrice_fr.ts +++ b/cockatrice/translations/cockatrice_fr.ts @@ -1198,37 +1198,42 @@ Cette information ne sera consultable que par les modérateurs. DlgCardSearch - + Card name: Nom de la carte: - + Card text: Texte de la carte: - + + Card Set (AND): + + + + Card type (OR): Type de la carte (OR): - + Color (OR): Couleur (OR): - + O&K O&K - + &Cancel &Annuler - + Card search Recherche de carte diff --git a/cockatrice/translations/cockatrice_gd.ts b/cockatrice/translations/cockatrice_gd.ts index 1239e8e42..e14c85062 100644 --- a/cockatrice/translations/cockatrice_gd.ts +++ b/cockatrice/translations/cockatrice_gd.ts @@ -657,33 +657,38 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: Ainm a' cairt: - + Card text: Not sure if this should be Teacsa cairt. Cairt teacsa: - + + Card Set (AND): + + + + Card type (OR): - + Color (OR): - + O&K &Ceart ma-thà - + &Cancel &Sguir dheth diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts index cae42231f..a71f0b317 100644 --- a/cockatrice/translations/cockatrice_it.ts +++ b/cockatrice/translations/cockatrice_it.ts @@ -977,37 +977,42 @@ Questo è solo visibile ai moderatori e non alla persona bannata. DlgCardSearch - + Card name: Nome carta: - + Card text: Testo carta: - + + Card Set (AND): + + + + Card type (OR): Tipo carta (OR): - + Color (OR): Colore (OR): - + O&K O&K - + &Cancel &Cancella - + Card search Cerca carta diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts index 59c121f59..4ad8085c7 100644 --- a/cockatrice/translations/cockatrice_ja.ts +++ b/cockatrice/translations/cockatrice_ja.ts @@ -798,37 +798,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: カード名: - + Card text: カードテキスト: - + + Card Set (AND): + + + + Card type (OR): カードタイプ（含む）: - + Color (OR): 色（含む）: - + O&K - + &Cancel - + Card search カード検索 diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts index 614b7e17b..387063b56 100644 --- a/cockatrice/translations/cockatrice_pl.ts +++ b/cockatrice/translations/cockatrice_pl.ts @@ -708,37 +708,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: Nazwa: - + Card text: Tekst: - + + Card Set (AND): + + + + Card type (OR): Typ karty (LUB): - + Color (OR): Kolor (LUB): - + O&K )&K - + &Cancel &Anuluj - + Card search Wyszukiwanie karty diff --git a/cockatrice/translations/cockatrice_pt-br.ts b/cockatrice/translations/cockatrice_pt-br.ts index ef959e7bf..6a64fe227 100644 --- a/cockatrice/translations/cockatrice_pt-br.ts +++ b/cockatrice/translations/cockatrice_pt-br.ts @@ -1147,37 +1147,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: Nome do card: - + Card text: Texto do card: - + + Card Set (AND): + + + + Card type (OR): Tipo do card (OU): - + Color (OR): Cor (OU): - + O&K &OK - + &Cancel &Cancelar - + Card search Buscar card diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts index 1e95ec9c2..788926e6b 100644 --- a/cockatrice/translations/cockatrice_pt.ts +++ b/cockatrice/translations/cockatrice_pt.ts @@ -1206,37 +1206,42 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban DlgCardSearch - + Card name: Nome da carta: - + Card text: Texto da carta: - + + Card Set (AND): + + + + Card type (OR): Tipo de carta (OU): - + Color (OR): Cor (OU): - + O&K &OK - + &Cancel &Cancelar - + Card search Pesquisar cartas diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts index ad700ed50..4050fdc76 100644 --- a/cockatrice/translations/cockatrice_ru.ts +++ b/cockatrice/translations/cockatrice_ru.ts @@ -1109,37 +1109,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: Название: - + Card text: Текст: - + + Card Set (AND): + + + + Card type (OR): Тип (Oracle): - + Color (OR): Цвет (Oracle): - + O&K О&к - + &Cancel &Отмена - + Card search Поиск diff --git a/cockatrice/translations/cockatrice_sk.ts b/cockatrice/translations/cockatrice_sk.ts index d9895f294..5b2f32ba1 100644 --- a/cockatrice/translations/cockatrice_sk.ts +++ b/cockatrice/translations/cockatrice_sk.ts @@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: - + Card text: - + + Card Set (AND): + + + + Card type (OR): - + Color (OR): - + O&K - + &Cancel - + Card search diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts index 3046123ac..37f89e50c 100644 --- a/cockatrice/translations/cockatrice_sv.ts +++ b/cockatrice/translations/cockatrice_sv.ts @@ -941,37 +941,42 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. DlgCardSearch - + Card name: Kortnamn: - + Card text: Korttext: - + + Card Set (AND): + + + + Card type (OR): Korttyp (ELLER): - + Color (OR): Färg (ELLER): - + O&K &OK - + &Cancel &Avbryt - + Card search Kortsökning diff --git a/cockatrice/translations/cockatrice_zh_CN.ts b/cockatrice/translations/cockatrice_zh_CN.ts index 580bc4028..4190952c7 100644 --- a/cockatrice/translations/cockatrice_zh_CN.ts +++ b/cockatrice/translations/cockatrice_zh_CN.ts @@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person. DlgCardSearch - + Card name: - + Card text: - + + Card Set (AND): + + + + Card type (OR): - + Color (OR): - + O&K - + &Cancel - + Card search