diff -r 803b277e4894 -r 3f21a9dc93d0 QTfrontend/ammoSchemeModel.cpp
--- a/QTfrontend/ammoSchemeModel.cpp	Sat Mar 06 10:54:24 2010 +0000
+++ b/QTfrontend/ammoSchemeModel.cpp	Sat Mar 06 10:59:20 2010 +0000
@@ -23,370 +23,370 @@
 #include "hwconsts.h"
 
 QList<QVariant> defaultScheme = QList<QVariant>()
-		<< QVariant("Default")     // name           0
-		<< QVariant(false)         // fortsmode      1
-		<< QVariant(false)         // team divide    2
-		<< QVariant(false)         // solid land     3
-		<< QVariant(false)         // border         4
-		<< QVariant(false)         // low gravity    5
-		<< QVariant(false)         // laser sight    6
-		<< QVariant(false)         // invulnerable   7
-		<< QVariant(true)          // add mines      8
-		<< QVariant(false)         // vampiric       9
-		<< QVariant(false)         // karma          10
-		<< QVariant(false)         // artillery      11
-		<< QVariant(true)          // random order   12
-		<< QVariant(false)         // king           13
-		<< QVariant(false)         // place hog      14
-		<< QVariant(false)         // shared ammo    15
-		<< QVariant(false)		   //disable girders 16
-		<< QVariant(100)           // damage modfier 17
-		<< QVariant(45)            // turn time      18
-		<< QVariant(100)           // init health    19
-		<< QVariant(15)            // sudden death   20
-		<< QVariant(5)             // case prob      21
-		<< QVariant(3)             //  mines time    22
-		<< QVariant(4)             //  landadds      23
-		<< QVariant(0)             // mine dud pct   24
-		<< QVariant(2)             // explosives     25
-		;
+        << QVariant("Default")     // name           0
+        << QVariant(false)         // fortsmode      1
+        << QVariant(false)         // team divide    2
+        << QVariant(false)         // solid land     3
+        << QVariant(false)         // border         4
+        << QVariant(false)         // low gravity    5
+        << QVariant(false)         // laser sight    6
+        << QVariant(false)         // invulnerable   7
+        << QVariant(true)          // add mines      8
+        << QVariant(false)         // vampiric       9
+        << QVariant(false)         // karma          10
+        << QVariant(false)         // artillery      11
+        << QVariant(true)          // random order   12
+        << QVariant(false)         // king           13
+        << QVariant(false)         // place hog      14
+        << QVariant(false)         // shared ammo    15
+        << QVariant(false)         //disable girders 16
+        << QVariant(100)           // damage modfier 17
+        << QVariant(45)            // turn time      18
+        << QVariant(100)           // init health    19
+        << QVariant(15)            // sudden death   20
+        << QVariant(5)             // case prob      21
+        << QVariant(3)             //  mines time    22
+        << QVariant(4)             //  landadds      23
+        << QVariant(0)             // mine dud pct   24
+        << QVariant(2)             // explosives     25
+        ;
 
 AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) :
-	QAbstractTableModel(parent),
-	numberOfDefaultSchemes(4),
-	fileConfig(fileName, QSettings::IniFormat)
+    QAbstractTableModel(parent),
+    numberOfDefaultSchemes(4),
+    fileConfig(fileName, QSettings::IniFormat)
 {
-	QStringList predefSchemesNames;
-	predefSchemesNames
-		<< "Default"
-		<< "Pro mode"
-		<< "Shoppa"
-		<< "Basketball"
-		<< "Minefield";
+    QStringList predefSchemesNames;
+    predefSchemesNames
+        << "Default"
+        << "Pro mode"
+        << "Shoppa"
+        << "Basketball"
+        << "Minefield";
 
-	spNames = QStringList()
-		<< "name"             //  0
-		<< "fortsmode"        //  1
-		<< "divteams"         //  2
-		<< "solidland"        //  3
-		<< "border"           //  4
-		<< "lowgrav"          //  5
-		<< "laser"            //  6
-		<< "invulnerability"  //  7
-		<< "mines"            //  8
-		<< "vampiric"         //  9
-		<< "karma"            // 10
-		<< "artillery"        // 11
-		<< "randomorder"      // 12
-		<< "king"             // 13
-		<< "placehog"         // 14
-		<< "sharedammo"       // 15
-		<< "disablegirders"	  // 16
-		<< "damagefactor"     // 17
-		<< "turntime"         // 18
-		<< "health"           // 19
-		<< "suddendeath"      // 20
-		<< "caseprobability"  // 21
-		<< "minestime"        // 22
-		<< "landadds"         // 23
-		<< "minedudpct"       // 24
-		<< "explosives"       // 25
-		;
+    spNames = QStringList()
+        << "name"             //  0
+        << "fortsmode"        //  1
+        << "divteams"         //  2
+        << "solidland"        //  3
+        << "border"           //  4
+        << "lowgrav"          //  5
+        << "laser"            //  6
+        << "invulnerability"  //  7
+        << "mines"            //  8
+        << "vampiric"         //  9
+        << "karma"            // 10
+        << "artillery"        // 11
+        << "randomorder"      // 12
+        << "king"             // 13
+        << "placehog"         // 14
+        << "sharedammo"       // 15
+        << "disablegirders"   // 16
+        << "damagefactor"     // 17
+        << "turntime"         // 18
+        << "health"           // 19
+        << "suddendeath"      // 20
+        << "caseprobability"  // 21
+        << "minestime"        // 22
+        << "landadds"         // 23
+        << "minedudpct"       // 24
+        << "explosives"       // 25
+        ;
 
-	QList<QVariant> proMode;
-	proMode
-		<< predefSchemesNames[1]   // name           0
-		<< QVariant(false)         // fortsmode      1
-		<< QVariant(false)         // team divide    2
-		<< QVariant(false)         // solid land     3
-		<< QVariant(false)         // border         4
-		<< QVariant(false)         // low gravity    5
-		<< QVariant(false)         // laser sight    6
-		<< QVariant(false)         // invulnerable   7
-		<< QVariant(false)         // add mines      8
-		<< QVariant(false)         // vampiric       9
-		<< QVariant(false)         // karma          10
-		<< QVariant(false)         // artillery      11
-		<< QVariant(true)          // random order   12
-		<< QVariant(false)         // king           13
-		<< QVariant(false)         // place hog      14
-		<< QVariant(true)          // shared ammo    15
-		<< QVariant(false)		   //disable girders 16
-		<< QVariant(100)           // damage modfier 17
-		<< QVariant(15)            // turn time      18
-		<< QVariant(100)           // init health    19
-		<< QVariant(15)            // sudden death   20
-		<< QVariant(0)             // case prob      21
-		<< QVariant(3)             //  mines time    22
-		<< QVariant(4)             //  landadds      23
-		<< QVariant(0)             // mine dud pct   24
-		<< QVariant(2)             // explosives     25
-		;
+    QList<QVariant> proMode;
+    proMode
+        << predefSchemesNames[1]   // name           0
+        << QVariant(false)         // fortsmode      1
+        << QVariant(false)         // team divide    2
+        << QVariant(false)         // solid land     3
+        << QVariant(false)         // border         4
+        << QVariant(false)         // low gravity    5
+        << QVariant(false)         // laser sight    6
+        << QVariant(false)         // invulnerable   7
+        << QVariant(false)         // add mines      8
+        << QVariant(false)         // vampiric       9
+        << QVariant(false)         // karma          10
+        << QVariant(false)         // artillery      11
+        << QVariant(true)          // random order   12
+        << QVariant(false)         // king           13
+        << QVariant(false)         // place hog      14
+        << QVariant(true)          // shared ammo    15
+        << QVariant(false)         //disable girders 16
+        << QVariant(100)           // damage modfier 17
+        << QVariant(15)            // turn time      18
+        << QVariant(100)           // init health    19
+        << QVariant(15)            // sudden death   20
+        << QVariant(0)             // case prob      21
+        << QVariant(3)             //  mines time    22
+        << QVariant(4)             //  landadds      23
+        << QVariant(0)             // mine dud pct   24
+        << QVariant(2)             // explosives     25
+        ;
 
-	QList<QVariant> shoppa;
-	shoppa
-		<< predefSchemesNames[2]   // name           0
-		<< QVariant(false)         // fortsmode      1
-		<< QVariant(false)         // team divide    2
-		<< QVariant(true)          // solid land     3
-		<< QVariant(true)          // border         4
-		<< QVariant(false)         // low gravity    5
-		<< QVariant(false)         // laser sight    6
-		<< QVariant(false)         // invulnerable   7
-		<< QVariant(false)         // add mines      8
-		<< QVariant(false)         // vampiric       9
-		<< QVariant(false)         // karma          10
-		<< QVariant(false)         // artillery      11
-		<< QVariant(true)          // random order   12
-		<< QVariant(false)         // king           13
-		<< QVariant(false)         // place hog      14
-		<< QVariant(true)          // shared ammo    15
-		<< QVariant(true)		   //disable girders 16
-		<< QVariant(100)           // damage modfier 17
-		<< QVariant(30)            // turn time      18
-		<< QVariant(100)           // init health    19
-		<< QVariant(50)            // sudden death   20
-		<< QVariant(1)             // case prob      21
-		<< QVariant(3)             //  mines time    22
-		<< QVariant(4)             //  landadds      23
-		<< QVariant(0)             // mine dud pct   24
-		<< QVariant(0)             // explosives     25
-		;
+    QList<QVariant> shoppa;
+    shoppa
+        << predefSchemesNames[2]   // name           0
+        << QVariant(false)         // fortsmode      1
+        << QVariant(false)         // team divide    2
+        << QVariant(true)          // solid land     3
+        << QVariant(true)          // border         4
+        << QVariant(false)         // low gravity    5
+        << QVariant(false)         // laser sight    6
+        << QVariant(false)         // invulnerable   7
+        << QVariant(false)         // add mines      8
+        << QVariant(false)         // vampiric       9
+        << QVariant(false)         // karma          10
+        << QVariant(false)         // artillery      11
+        << QVariant(true)          // random order   12
+        << QVariant(false)         // king           13
+        << QVariant(false)         // place hog      14
+        << QVariant(true)          // shared ammo    15
+        << QVariant(true)          //disable girders 16
+        << QVariant(100)           // damage modfier 17
+        << QVariant(30)            // turn time      18
+        << QVariant(100)           // init health    19
+        << QVariant(50)            // sudden death   20
+        << QVariant(1)             // case prob      21
+        << QVariant(3)             //  mines time    22
+        << QVariant(4)             //  landadds      23
+        << QVariant(0)             // mine dud pct   24
+        << QVariant(0)             // explosives     25
+        ;
 
-	QList<QVariant> basketball;
-	basketball
-		<< predefSchemesNames[3]   // name           0
-		<< QVariant(false)         // fortsmode      1
-		<< QVariant(false)         // team divide    2
-		<< QVariant(true)          // solid land     3
-		<< QVariant(true)          // border         4
-		<< QVariant(true)          // low gravity    5
-		<< QVariant(false)         // laser sight    6
-		<< QVariant(true)          // invulnerable   7
-		<< QVariant(false)         // add mines      8
-		<< QVariant(false)         // vampiric       9
-		<< QVariant(false)         // karma          10
-		<< QVariant(false)         // artillery      11
-		<< QVariant(true)          // random order   12
-		<< QVariant(false)         // king           13
-		<< QVariant(false)         // place hog      14
-		<< QVariant(true)          // shared ammo    15
-		<< QVariant(true)		   //disable girders 16
-		<< QVariant(100)           // damage modfier 17
-		<< QVariant(30)            // turn time      18
-		<< QVariant(100)           // init health    19
-		<< QVariant(15)            // sudden death   20
-		<< QVariant(0)             // case prob      21
-		<< QVariant(3)             //  mines time    22
-		<< QVariant(4)             //  landadds      23
-		<< QVariant(0)             // mine dud pct   24
-		<< QVariant(0)             // explosives     25
-		;
+    QList<QVariant> basketball;
+    basketball
+        << predefSchemesNames[3]   // name           0
+        << QVariant(false)         // fortsmode      1
+        << QVariant(false)         // team divide    2
+        << QVariant(true)          // solid land     3
+        << QVariant(true)          // border         4
+        << QVariant(true)          // low gravity    5
+        << QVariant(false)         // laser sight    6
+        << QVariant(true)          // invulnerable   7
+        << QVariant(false)         // add mines      8
+        << QVariant(false)         // vampiric       9
+        << QVariant(false)         // karma          10
+        << QVariant(false)         // artillery      11
+        << QVariant(true)          // random order   12
+        << QVariant(false)         // king           13
+        << QVariant(false)         // place hog      14
+        << QVariant(true)          // shared ammo    15
+        << QVariant(true)          //disable girders 16
+        << QVariant(100)           // damage modfier 17
+        << QVariant(30)            // turn time      18
+        << QVariant(100)           // init health    19
+        << QVariant(15)            // sudden death   20
+        << QVariant(0)             // case prob      21
+        << QVariant(3)             //  mines time    22
+        << QVariant(4)             //  landadds      23
+        << QVariant(0)             // mine dud pct   24
+        << QVariant(0)             // explosives     25
+        ;
 
-	QList<QVariant> minefield;
-	minefield
-		<< predefSchemesNames[4]   // name           0
-		<< QVariant(false)         // fortsmode      1
-		<< QVariant(false)         // team divide    2
-		<< QVariant(false)         // solid land     3
-		<< QVariant(false)         // border         4
-		<< QVariant(false)         // low gravity    5
-		<< QVariant(false)         // laser sight    6
-		<< QVariant(false)         // invulnerable   7
-		<< QVariant(true)          // add mines      8
-		<< QVariant(false)         // vampiric       9
-		<< QVariant(false)         // karma          10
-		<< QVariant(false)         // artillery      11
-		<< QVariant(true)          // random order   12
-		<< QVariant(false)         // king           13
-		<< QVariant(false)         // place hog      14
-		<< QVariant(true)          // shared ammo    15
-		<< QVariant(true)		   //disable girders 16
-		<< QVariant(150)           // damage modfier 17
-		<< QVariant(30)            // turn time      18
-		<< QVariant(50)            // init health    19
-		<< QVariant(15)            // sudden death   20
-		<< QVariant(0)             // case prob      21
-		<< QVariant(0)             //  mines time    22
-		<< QVariant(80)            //  landadds      23
-		<< QVariant(0)             // mine dud pct   24
-		<< QVariant(0)             // explosives     25
-		;
+    QList<QVariant> minefield;
+    minefield
+        << predefSchemesNames[4]   // name           0
+        << QVariant(false)         // fortsmode      1
+        << QVariant(false)         // team divide    2
+        << QVariant(false)         // solid land     3
+        << QVariant(false)         // border         4
+        << QVariant(false)         // low gravity    5
+        << QVariant(false)         // laser sight    6
+        << QVariant(false)         // invulnerable   7
+        << QVariant(true)          // add mines      8
+        << QVariant(false)         // vampiric       9
+        << QVariant(false)         // karma          10
+        << QVariant(false)         // artillery      11
+        << QVariant(true)          // random order   12
+        << QVariant(false)         // king           13
+        << QVariant(false)         // place hog      14
+        << QVariant(true)          // shared ammo    15
+        << QVariant(true)          //disable girders 16
+        << QVariant(150)           // damage modfier 17
+        << QVariant(30)            // turn time      18
+        << QVariant(50)            // init health    19
+        << QVariant(15)            // sudden death   20
+        << QVariant(0)             // case prob      21
+        << QVariant(0)             //  mines time    22
+        << QVariant(80)            //  landadds      23
+        << QVariant(0)             // mine dud pct   24
+        << QVariant(0)             // explosives     25
+        ;
 
-	schemes.append(defaultScheme);
-	schemes.append(proMode);
-	schemes.append(shoppa);
-	schemes.append(basketball);
-	schemes.append(minefield);
+    schemes.append(defaultScheme);
+    schemes.append(proMode);
+    schemes.append(shoppa);
+    schemes.append(basketball);
+    schemes.append(minefield);
 
 
-	int size = fileConfig.beginReadArray("schemes");
-	for (int i = 0; i < size; ++i) {
-		fileConfig.setArrayIndex(i);
+    int size = fileConfig.beginReadArray("schemes");
+    for (int i = 0; i < size; ++i) {
+        fileConfig.setArrayIndex(i);
 
-		if (!predefSchemesNames.contains(fileConfig.value(spNames[0]).toString()))
-		{
-			QList<QVariant> scheme;
+        if (!predefSchemesNames.contains(fileConfig.value(spNames[0]).toString()))
+        {
+            QList<QVariant> scheme;
 
-			for (int k = 0; k < spNames.size(); ++k)
-				scheme << fileConfig.value(spNames[k], defaultScheme[k]);
+            for (int k = 0; k < spNames.size(); ++k)
+                scheme << fileConfig.value(spNames[k], defaultScheme[k]);
 
-			schemes.append(scheme);
-		}
-	}
-	fileConfig.endArray();
+            schemes.append(scheme);
+        }
+    }
+    fileConfig.endArray();
 }
 
 QVariant AmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-	return QVariant();
+    return QVariant();
 }
 
 int AmmoSchemeModel::rowCount(const QModelIndex &parent) const
 {
-	if (parent.isValid())
-		return 0;
-	else
-		return schemes.size();
+    if (parent.isValid())
+        return 0;
+    else
+        return schemes.size();
 }
 
 int AmmoSchemeModel::columnCount(const QModelIndex & parent) const
 {
-	if (parent.isValid())
-		return 0;
-	else
-		return defaultScheme.size();
+    if (parent.isValid())
+        return 0;
+    else
+        return defaultScheme.size();
 }
 
 Qt::ItemFlags AmmoSchemeModel::flags(const QModelIndex & index) const
 {
-	return
-		Qt::ItemIsEnabled
-		| Qt::ItemIsSelectable
-		| Qt::ItemIsEditable;
+    return
+        Qt::ItemIsEnabled
+        | Qt::ItemIsSelectable
+        | Qt::ItemIsEditable;
 }
 
 bool AmmoSchemeModel::setData(const QModelIndex & index, const QVariant & value, int role)
 {
-	if (!index.isValid() || index.row() < numberOfDefaultSchemes
-		|| index.row() >= schemes.size()
-		|| index.column() >= defaultScheme.size()
-		|| role != Qt::EditRole)
-		return false;
+    if (!index.isValid() || index.row() < numberOfDefaultSchemes
+        || index.row() >= schemes.size()
+        || index.column() >= defaultScheme.size()
+        || role != Qt::EditRole)
+        return false;
 
-	schemes[index.row()][index.column()] = value;
+    schemes[index.row()][index.column()] = value;
 
-	emit dataChanged(index, index);
-	return true;
+    emit dataChanged(index, index);
+    return true;
 }
 
 bool AmmoSchemeModel::insertRows(int row, int count, const QModelIndex & parent)
 {
-	beginInsertRows(parent, row, row);
+    beginInsertRows(parent, row, row);
 
-	QList<QVariant> newScheme = defaultScheme;
-	newScheme[0] = QVariant(tr("new"));
+    QList<QVariant> newScheme = defaultScheme;
+    newScheme[0] = QVariant(tr("new"));
 
-	schemes.insert(row, newScheme);
+    schemes.insert(row, newScheme);
 
-	endInsertRows();
+    endInsertRows();
 
-	return true;
+    return true;
 }
 
 bool AmmoSchemeModel::removeRows(int row, int count, const QModelIndex & parent)
 {
-	if(count != 1
-		|| row < numberOfDefaultSchemes
-		|| row >= schemes.size())
-		return false;
+    if(count != 1
+        || row < numberOfDefaultSchemes
+        || row >= schemes.size())
+        return false;
 
-	beginRemoveRows(parent, row, row);
+    beginRemoveRows(parent, row, row);
 
-	schemes.removeAt(row);
+    schemes.removeAt(row);
 
-	endRemoveRows();
+    endRemoveRows();
 
-	return true;
+    return true;
 }
 
 QVariant AmmoSchemeModel::data(const QModelIndex &index, int role) const
 {
-	if (!index.isValid() || index.row() < 0
-		|| index.row() >= schemes.size()
-		|| index.column() >= defaultScheme.size()
-		|| (role != Qt::EditRole && role != Qt::DisplayRole)
-		)
-		return QVariant();
+    if (!index.isValid() || index.row() < 0
+        || index.row() >= schemes.size()
+        || index.column() >= defaultScheme.size()
+        || (role != Qt::EditRole && role != Qt::DisplayRole)
+        )
+        return QVariant();
 
-	return schemes[index.row()][index.column()];
+    return schemes[index.row()][index.column()];
 }
 
 void AmmoSchemeModel::Save()
 {
-	fileConfig.beginWriteArray("schemes", schemes.size());
+    fileConfig.beginWriteArray("schemes", schemes.size());
 
-	for (int i = 0; i < schemes.size(); ++i) {
-		fileConfig.setArrayIndex(i);
+    for (int i = 0; i < schemes.size(); ++i) {
+        fileConfig.setArrayIndex(i);
 
-		QList<QVariant> scheme = schemes[i];
+        QList<QVariant> scheme = schemes[i];
 
-		for (int k = 0; k < scheme.size(); ++k)
-			fileConfig.setValue(spNames[k], scheme[k]);
-	}
-	fileConfig.endArray();
+        for (int k = 0; k < scheme.size(); ++k)
+            fileConfig.setValue(spNames[k], scheme[k]);
+    }
+    fileConfig.endArray();
 }
 
 
 NetAmmoSchemeModel::NetAmmoSchemeModel(QObject * parent) :
-	QAbstractTableModel(parent)
+    QAbstractTableModel(parent)
 {
-	netScheme = defaultScheme;
+    netScheme = defaultScheme;
 }
 
 QVariant NetAmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-	return QVariant();
+    return QVariant();
 }
 
 int NetAmmoSchemeModel::rowCount(const QModelIndex & parent) const
 {
-	if (parent.isValid())
-		return 0;
-	else
-		return 1;
+    if (parent.isValid())
+        return 0;
+    else
+        return 1;
 }
 
 int NetAmmoSchemeModel::columnCount(const QModelIndex & parent) const
 {
-	if (parent.isValid())
-		return 0;
-	else
-		return defaultScheme.size();
+    if (parent.isValid())
+        return 0;
+    else
+        return defaultScheme.size();
 }
 
 QVariant NetAmmoSchemeModel::data(const QModelIndex &index, int role) const
 {
-	if (!index.isValid() || index.row() < 0
-		|| index.row() > 1
-		|| index.column() >= defaultScheme.size()
-		|| (role != Qt::EditRole && role != Qt::DisplayRole)
-		)
-		return QVariant();
+    if (!index.isValid() || index.row() < 0
+        || index.row() > 1
+        || index.column() >= defaultScheme.size()
+        || (role != Qt::EditRole && role != Qt::DisplayRole)
+        )
+        return QVariant();
 
-	return netScheme[index.column()];
+    return netScheme[index.column()];
 }
 
 void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg)
 {
-	if(cfg.size() != netScheme.size())
-	{
-		qWarning("Incorrect scheme cfg size");
-		return;
-	}
+    if(cfg.size() != netScheme.size())
+    {
+        qWarning("Incorrect scheme cfg size");
+        return;
+    }
 
-	for(int i = 0; i < cfg.size(); ++i)
-		netScheme[i] = QVariant(cfg[i]);
+    for(int i = 0; i < cfg.size(); ++i)
+        netScheme[i] = QVariant(cfg[i]);
 
-	reset();
+    reset();
 }