# HG changeset patch # User sheepluva # Date 1523141542 -7200 # Node ID 3546bb36c8fb7333c182b9a89f9df5e424f55765 # Parent fe85ba81b01b9d63312afbdfe4275e278c226ec9 cleanup whitespaces, add braces to for loops also throw in a break for good measure diff -r fe85ba81b01b -r 3546bb36c8fb QTfrontend/ui/widget/selectWeapon.cpp --- a/QTfrontend/ui/widget/selectWeapon.cpp Sun Apr 08 00:26:33 2018 +0200 +++ b/QTfrontend/ui/widget/selectWeapon.cpp Sun Apr 08 00:52:22 2018 +0200 @@ -87,7 +87,9 @@ { wconf = new QMap(); for(int i = 0; i < cDefaultAmmos.size(); ++i) + { wconf->insert(cDefaultAmmos[i].first, cDefaultAmmos[i].second); + } if (!QDir(cfgdir->absolutePath() + "/Schemes").exists()) { QDir().mkdir(cfgdir->absolutePath() + "/Schemes"); @@ -99,8 +101,10 @@ QSettings old_wconf(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat); QStringList defaultAmmos; - for(int i = 0; i < cDefaultAmmos.size(); ++i) - defaultAmmos.append(cDefaultAmmos[i].first); + for(int i = 0; i < cDefaultAmmos.size(); ++i) + { + defaultAmmos.append(cDefaultAmmos[i].first); + } QStringList keys = old_wconf.allKeys(); int imported = 0; @@ -118,7 +122,7 @@ } } qDebug("%d weapon scheme(s) imported.", imported); - } else { + } else { QStringList schemes = QDir(cfgdir->absolutePath() + "/Schemes/Ammo").entryList(); for(int i = 0; i < schemes.size(); i++) @@ -205,10 +209,13 @@ { bool enable = true; for(int i = 0; i < cDefaultAmmos.size(); i++) + { if (!cDefaultAmmos[i].first.compare(m_name->text())) { enable = false; + break; } + } for(int i = 0; i < m_numItems; ++i) { twi::iterator it = weaponItems.find(i); @@ -228,10 +235,12 @@ void SelWeaponWidget::setDefault() { for(int i = 0; i < cDefaultAmmos.size(); i++) + { if (!cDefaultAmmos[i].first.compare(m_name->text())) { return; } + } setWeapons(*cDefaultAmmoStore); } @@ -323,6 +332,7 @@ if (delWeaponsName == "") return; for(int i = 0; i < cDefaultAmmos.size(); i++) + { if (!cDefaultAmmos[i].first.compare(delWeaponsName)) { QMessageBox deniedMsg(this); @@ -333,6 +343,7 @@ deniedMsg.exec(); return; } + } QMessageBox reallyDeleteMsg(this); reallyDeleteMsg.setIcon(QMessageBox::Question); @@ -427,7 +438,9 @@ ; for(int i = sl.length() - 1; i >= 0; --i) + { sl[i] = sl[i].leftJustified(neededLength, '0', true); + } return sl.join(QString()); }