--- a/QTfrontend/hwform.cpp Thu Jan 01 12:41:28 2015 -0500
+++ b/QTfrontend/hwform.cpp Fri Jan 02 00:14:49 2015 +0300
@@ -1832,14 +1832,14 @@
if (hwnet)
{
NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
- connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
+ connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList)));
ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
ui.pageNetGame->setRoomName(hwnet->getRoom());
ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
- connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)),
+ connect(hwnet, SIGNAL(netSchemeConfig(QStringList)),
this, SLOT(selectFirstNetScheme()));
}
--- a/QTfrontend/model/ammoSchemeModel.cpp Thu Jan 01 12:41:28 2015 -0500
+++ b/QTfrontend/model/ammoSchemeModel.cpp Fri Jan 02 00:14:49 2015 +0300
@@ -845,18 +845,15 @@
return netScheme[index.column()];
}
-void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg)
+void NetAmmoSchemeModel::setNetSchemeConfig(QStringList cfg)
{
if(cfg.size() != netScheme.size())
{
qWarning("Incorrect scheme cfg size");
return;
}
-
- if (cfg[42].at(0)=='!')
- cfg[42] = cfg[42].mid(1);
- else
- qDebug() << "Script param didn't start with !: " << cfg[42];
+
+ cfg[42] = cfg[42].mid(1);
for(int i = 0; i < cfg.size(); ++i)
netScheme[i] = QVariant(cfg[i]);
--- a/QTfrontend/model/ammoSchemeModel.h Thu Jan 01 12:41:28 2015 -0500
+++ b/QTfrontend/model/ammoSchemeModel.h Fri Jan 02 00:14:49 2015 +0300
@@ -70,7 +70,7 @@
QVariant data(const QModelIndex &index, int role) const;
public slots:
- void setNetSchemeConfig(QStringList & cfg);
+ void setNetSchemeConfig(QStringList cfg);
private:
QList<QVariant> netScheme;
--- a/QTfrontend/net/newnetclient.h Thu Jan 01 12:41:28 2015 -0500
+++ b/QTfrontend/net/newnetclient.h Fri Jan 02 00:14:49 2015 +0300
@@ -111,7 +111,7 @@
void roomNameUpdated(const QString & name);
void askForRoomPassword();
- void netSchemeConfig(QStringList &);
+ void netSchemeConfig(QStringList);
void paramChanged(const QString & param, const QStringList & value);
void configAsked();