Fixed missing MapCenter
authorinsilmaril
Wed, 16 Jan 2008 15:45:19 +0000
changeset 6589e196213c003
parent 657 8e596f73f258
child 659 b582bba9e312
Fixed missing MapCenter
mainwindow.cpp
mapeditor.cpp
     1.1 --- a/mainwindow.cpp	Wed Jan 16 15:45:19 2008 +0000
     1.2 +++ b/mainwindow.cpp	Wed Jan 16 15:45:19 2008 +0000
     1.3 @@ -2636,7 +2636,7 @@
     1.4  					urls.at(i);
     1.5  #endif
     1.6  				p->start ("dcop",args);
     1.7 -				cout << args.join(" ").ascii()<<endl;
     1.8 +				cout << qPrintable (args.join(" "))<<endl;
     1.9  				if ( !p->waitForStarted() ) success=false;
    1.10  			}
    1.11  			if (!success)
    1.12 @@ -3962,7 +3962,7 @@
    1.13  
    1.14  		if (! m.isEmpty())
    1.15  		{
    1.16 -			//cout <<"Main::callMacro  m="<<m.ascii()<<endl;
    1.17 +			//cout <<"Main::callMacro  m="<<qPrintable (m)<<endl;
    1.18  			currentMapEditor()->runScript (m);
    1.19  		}	
    1.20  	}	
     2.1 --- a/mapeditor.cpp	Wed Jan 16 15:45:19 2008 +0000
     2.2 +++ b/mapeditor.cpp	Wed Jan 16 15:45:19 2008 +0000
     2.3 @@ -359,7 +359,7 @@
     2.4  
     2.5  	if (blockSaveState) return;
     2.6  
     2.7 -	if (debug) cout << "ME::saveState() for  "<<mapName.ascii()<<endl;
     2.8 +	if (debug) cout << "ME::saveState() for  "<<qPrintable (mapName)<<endl;
     2.9  	
    2.10  	// Find out current undo directory
    2.11  	if (undosAvail<stepsTotal) undosAvail++;
    2.12 @@ -424,7 +424,7 @@
    2.13  		cout << "    undoSel="<<undoSelection.toStdString()<<endl;
    2.14  		cout << "    redoCom="<<redoCom.toStdString()<<endl;
    2.15  		cout << "    redoSel="<<redoSelection.toStdString()<<endl;
    2.16 -		if (saveSel) cout << "    saveSel="<<saveSel->getSelectString().ascii()<<endl;
    2.17 +		if (saveSel) cout << "    saveSel="<<qPrintable (saveSel->getSelectString())<<endl;
    2.18  		cout << "    ---------------------------"<<endl;
    2.19  	}
    2.20  
    2.21 @@ -1005,10 +1005,10 @@
    2.22  									{
    2.23  										if (selb->getHeading() == u)
    2.24  										{
    2.25 -											cout << "PASSED: " << c.ascii() << endl;
    2.26 +											cout << "PASSED: " << qPrintable (c)  << endl;
    2.27  										} else
    2.28  										{
    2.29 -											cout << "FAILED: " << c.ascii() << endl;
    2.30 +											cout << "FAILED: " << qPrintable (c)  << endl;
    2.31  										}
    2.32  									}
    2.33  								}
    2.34 @@ -4841,7 +4841,7 @@
    2.35  	{
    2.36  		if (debug)
    2.37  			foreach (QString format,event->mimeData()->formats()) 
    2.38 -				cout << "MapEditor: Dropped format: "<<format.ascii()<<endl;
    2.39 +				cout << "MapEditor: Dropped format: "<<qPrintable (format)<<endl;
    2.40  
    2.41  
    2.42  		QList <QUrl> uris;
    2.43 @@ -4944,7 +4944,7 @@
    2.44      connect(clientSocket, SIGNAL(error(QAbstractSocket::SocketError)),
    2.45              this, SLOT(displayNetworkError(QAbstractSocket::SocketError)));
    2.46  	netstate=Client;		
    2.47 -	cout<<"connected to "<<server.ascii()<<" port "<<port<<endl;
    2.48 +	cout<<"connected to "<<qPrintable (server)<<" port "<<port<<endl;
    2.49  
    2.50  	
    2.51  }
    2.52 @@ -4955,7 +4955,7 @@
    2.53      connect(newClient, SIGNAL(disconnected()),
    2.54              newClient, SLOT(deleteLater()));
    2.55  
    2.56 -	cout <<"ME::newClient  at "<<newClient->peerAddress().toString().ascii()<<endl;
    2.57 +	cout <<"ME::newClient  at "<<qPrintable( newClient->peerAddress().toString() )<<endl;
    2.58  
    2.59  	clientList.append (newClient);
    2.60  }
    2.61 @@ -4985,11 +4985,11 @@
    2.62  	out << bs;
    2.63  
    2.64  	if (debug)
    2.65 -		cout << "ME::sendData  bs="<<bs<<"  counter="<<sendCounter<<"  s="<<s.ascii()<<endl;
    2.66 +		cout << "ME::sendData  bs="<<bs<<"  counter="<<sendCounter<<"  s="<<qPrintable(s)<<endl;
    2.67  
    2.68  	for (int i=0; i<clientList.size(); ++i)
    2.69  	{
    2.70 -		//cout << "Sending \""<<s.ascii()<<"\" to "<<clientList.at(i)->peerAddress().toString().ascii()<<endl;
    2.71 +		//cout << "Sending \""<<qPrintable (s)<<"\" to "<<qPrintable (clientList.at(i)->peerAddress().toString())<<endl;
    2.72  		clientList.at(i)->write (block);
    2.73  	}
    2.74  }
    2.75 @@ -5012,7 +5012,7 @@
    2.76  		QString t;
    2.77  		in >>t;
    2.78  		if (debug)
    2.79 -			cout << "  t="<<t.ascii()<<endl;
    2.80 +			cout << "  t="<<qPrintable (t)<<endl;
    2.81  		parseAtom (t);
    2.82  	}
    2.83  	return;