# HG changeset patch
# User insilmaril
# Date 1200498319 0
# Node ID 9e196213c003dc7f5616e5cd79eb1fcb792db23a
# Parent  8e596f73f258840acc813f157e4bf312d794472f
Fixed missing MapCenter

diff -r 8e596f73f258 -r 9e196213c003 mainwindow.cpp
--- a/mainwindow.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/mainwindow.cpp	Wed Jan 16 15:45:19 2008 +0000
@@ -2636,7 +2636,7 @@
 					urls.at(i);
 #endif
 				p->start ("dcop",args);
-				cout << args.join(" ").ascii()<<endl;
+				cout << qPrintable (args.join(" "))<<endl;
 				if ( !p->waitForStarted() ) success=false;
 			}
 			if (!success)
@@ -3962,7 +3962,7 @@
 
 		if (! m.isEmpty())
 		{
-			//cout <<"Main::callMacro  m="<<m.ascii()<<endl;
+			//cout <<"Main::callMacro  m="<<qPrintable (m)<<endl;
 			currentMapEditor()->runScript (m);
 		}	
 	}	
diff -r 8e596f73f258 -r 9e196213c003 mapeditor.cpp
--- a/mapeditor.cpp	Wed Jan 16 15:45:19 2008 +0000
+++ b/mapeditor.cpp	Wed Jan 16 15:45:19 2008 +0000
@@ -359,7 +359,7 @@
 
 	if (blockSaveState) return;
 
-	if (debug) cout << "ME::saveState() for  "<<mapName.ascii()<<endl;
+	if (debug) cout << "ME::saveState() for  "<<qPrintable (mapName)<<endl;
 	
 	// Find out current undo directory
 	if (undosAvail<stepsTotal) undosAvail++;
@@ -424,7 +424,7 @@
 		cout << "    undoSel="<<undoSelection.toStdString()<<endl;
 		cout << "    redoCom="<<redoCom.toStdString()<<endl;
 		cout << "    redoSel="<<redoSelection.toStdString()<<endl;
-		if (saveSel) cout << "    saveSel="<<saveSel->getSelectString().ascii()<<endl;
+		if (saveSel) cout << "    saveSel="<<qPrintable (saveSel->getSelectString())<<endl;
 		cout << "    ---------------------------"<<endl;
 	}
 
@@ -1005,10 +1005,10 @@
 									{
 										if (selb->getHeading() == u)
 										{
-											cout << "PASSED: " << c.ascii() << endl;
+											cout << "PASSED: " << qPrintable (c)  << endl;
 										} else
 										{
-											cout << "FAILED: " << c.ascii() << endl;
+											cout << "FAILED: " << qPrintable (c)  << endl;
 										}
 									}
 								}
@@ -4841,7 +4841,7 @@
 	{
 		if (debug)
 			foreach (QString format,event->mimeData()->formats()) 
-				cout << "MapEditor: Dropped format: "<<format.ascii()<<endl;
+				cout << "MapEditor: Dropped format: "<<qPrintable (format)<<endl;
 
 
 		QList <QUrl> uris;
@@ -4944,7 +4944,7 @@
     connect(clientSocket, SIGNAL(error(QAbstractSocket::SocketError)),
             this, SLOT(displayNetworkError(QAbstractSocket::SocketError)));
 	netstate=Client;		
-	cout<<"connected to "<<server.ascii()<<" port "<<port<<endl;
+	cout<<"connected to "<<qPrintable (server)<<" port "<<port<<endl;
 
 	
 }
@@ -4955,7 +4955,7 @@
     connect(newClient, SIGNAL(disconnected()),
             newClient, SLOT(deleteLater()));
 
-	cout <<"ME::newClient  at "<<newClient->peerAddress().toString().ascii()<<endl;
+	cout <<"ME::newClient  at "<<qPrintable( newClient->peerAddress().toString() )<<endl;
 
 	clientList.append (newClient);
 }
@@ -4985,11 +4985,11 @@
 	out << bs;
 
 	if (debug)
-		cout << "ME::sendData  bs="<<bs<<"  counter="<<sendCounter<<"  s="<<s.ascii()<<endl;
+		cout << "ME::sendData  bs="<<bs<<"  counter="<<sendCounter<<"  s="<<qPrintable(s)<<endl;
 
 	for (int i=0; i<clientList.size(); ++i)
 	{
-		//cout << "Sending \""<<s.ascii()<<"\" to "<<clientList.at(i)->peerAddress().toString().ascii()<<endl;
+		//cout << "Sending \""<<qPrintable (s)<<"\" to "<<qPrintable (clientList.at(i)->peerAddress().toString())<<endl;
 		clientList.at(i)->write (block);
 	}
 }
@@ -5012,7 +5012,7 @@
 		QString t;
 		in >>t;
 		if (debug)
-			cout << "  t="<<t.ascii()<<endl;
+			cout << "  t="<<qPrintable (t)<<endl;
 		parseAtom (t);
 	}
 	return;