# HG changeset patch
# User unc0rr
# Date 1292436625 -10800
# Node ID 3952788909553bbd34a9a8ac2c862e76bda89fd7
# Parent  8d35c3e0e6ba73abf54dd557d9b282e8e489eff2
Don't use std::string

diff -r 8d35c3e0e6ba -r 395278890955 QTfrontend/hwmap.cpp
--- a/QTfrontend/hwmap.cpp	Tue Dec 14 20:41:33 2010 -0500
+++ b/QTfrontend/hwmap.cpp	Wed Dec 15 21:10:25 2010 +0300
@@ -27,7 +27,7 @@
 {
 }
 
-void HWMap::getImage(std::string seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData)
+void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData)
 {
     m_seed = seed;
     templateFilter = filter;
@@ -60,14 +60,14 @@
 
 void HWMap::SendToClientFirst()
 {
-    SendIPC(QString("eseed %1").arg(m_seed.c_str()).toLatin1());
-    SendIPC(QString("e$template_filter %1").arg(templateFilter).toLatin1());
-    SendIPC(QString("e$mapgen %1").arg(m_mapgen).toLatin1());
+    SendIPC(QString("eseed %1").arg(m_seed).toUtf8());
+    SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8());
+    SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8());
 
     switch (m_mapgen)
     {
         case MAPGEN_MAZE:
-            SendIPC(QString("e$maze_size %1").arg(m_maze_size).toLatin1());
+            SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8());
             break;
 
         case MAPGEN_DRAWN:
diff -r 8d35c3e0e6ba -r 395278890955 QTfrontend/hwmap.h
--- a/QTfrontend/hwmap.h	Tue Dec 14 20:41:33 2010 -0500
+++ b/QTfrontend/hwmap.h	Wed Dec 15 21:10:25 2010 +0300
@@ -25,8 +25,6 @@
 
 #include "tcpBase.h"
 
-#include <string>
-
 enum MapGenerator
 {
     MAPGEN_REGULAR,
@@ -42,7 +40,7 @@
  public:
   HWMap();
   virtual ~HWMap();
-  void getImage(std::string seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData);
+  void getImage(const QString & seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData);
 
  protected:
   virtual QStringList setArguments();
@@ -54,7 +52,7 @@
   void HHLimitReceived(int hhLimit);
 
  private:
-  std::string m_seed;
+  QString m_seed;
   int templateFilter;
   MapGenerator m_mapgen;
   int m_maze_size;
diff -r 8d35c3e0e6ba -r 395278890955 QTfrontend/mapContainer.cpp
--- a/QTfrontend/mapContainer.cpp	Tue Dec 14 20:41:33 2010 -0500
+++ b/QTfrontend/mapContainer.cpp	Wed Dec 15 21:10:25 2010 +0300
@@ -343,7 +343,7 @@
     pMap = new HWMap();
     connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage)));
     connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int)));
-    pMap->getImage(m_seed.toStdString(), getTemplateFilter(), mapgen, maze_size, getDrawnMapData());
+    pMap->getImage(m_seed, getTemplateFilter(), mapgen, maze_size, getDrawnMapData());
 }
 
 void HWMapContainer::themeSelected(int currentRow)
diff -r 8d35c3e0e6ba -r 395278890955 QTfrontend/mapContainer.h
--- a/QTfrontend/mapContainer.h	Tue Dec 14 20:41:33 2010 -0500
+++ b/QTfrontend/mapContainer.h	Wed Dec 15 21:10:25 2010 +0300
@@ -55,10 +55,10 @@
   bool getCurrentIsMission() const;
   QByteArray getDrawnMapData();
   DrawMapScene * getDrawMapScene();
+  void mapDrawingFinished();
 
  public slots:
   void changeImage();
-  void mapDrawingFinished();
   void setSeed(const QString & seed);
   void setMap(const QString & map);
   void setTheme(const QString & theme);
diff -r 8d35c3e0e6ba -r 395278890955 QTfrontend/newnetclient.cpp
--- a/QTfrontend/newnetclient.cpp	Tue Dec 14 20:41:33 2010 -0500
+++ b/QTfrontend/newnetclient.cpp	Wed Dec 15 21:10:25 2010 +0300
@@ -608,6 +608,7 @@
 
 void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
 {
+    qDebug() << param;
     if (isChief)
         RawSendNet(
                 QString("CFG%1%2%1%3")