1.1 Binary file demos/vym-projectplan.vym has changed

     2.1 --- a/vymmodel.cpp	Wed Jan 16 15:45:19 2008 +0000
     2.2 +++ b/vymmodel.cpp	Wed Jan 16 15:45:20 2008 +0000
     2.3 @@ -23,6 +23,7 @@
     2.4  
     2.5  void VymModel::init () 
     2.6  {
     2.7 +	addMapCenter();
     2.8  }
     2.9  
    2.10  void VymModel::setMapEditor(MapEditor *me)

     3.1 --- a/xml-freemind.cpp	Wed Jan 16 15:45:19 2008 +0000
     3.2 +++ b/xml-freemind.cpp	Wed Jan 16 15:45:20 2008 +0000
     3.3 @@ -46,11 +46,11 @@
     3.4  {
     3.5      QColor col;
     3.6  	/* Testing
     3.7 -	cout << "startElement <"<< eName.ascii()
     3.8 +	cout << "startElement <"<< qPrintable(eName)
     3.9  		<<">  state="<<state 
    3.10  		<<"  laststate="<<stateStack.last()
    3.11  		<<"   loadMode="<<loadMode
    3.12 -	//	<<"       line="<<QXmlDefaultHandler::lineNumber().ascii()
    3.13 +	//	<<"       line="<<qPrintable (QXmlDefaultHandler::lineNumber())
    3.14  		<<endl;
    3.15  	*/	
    3.16  	stateStack.append (state);	
    3.17 @@ -202,7 +202,7 @@
    3.18  bool parseFreemindHandler::endElement  ( const QString&, const QString&, const QString &eName)
    3.19  {
    3.20  	/* Testing
    3.21 -	cout << "endElement </" <<eName.ascii()
    3.22 +	cout << "endElement </" <<qPrintable(eName)
    3.23  		<<">  state=" <<state 
    3.24  		<<"  laststate=" <<laststate
    3.25  		<<"  stateStack="<<stateStack.last() 
    3.26 @@ -222,7 +222,7 @@
    3.27  
    3.28  bool parseFreemindHandler::characters   ( const QString& ch)
    3.29  {
    3.30 -	//cout << "characters \""<<ch.ascii()<<"\"  state="<<state <<"  laststate="<<laststate<<endl;
    3.31 +	//cout << "characters \""<<qPrintable(ch)<<"\"  state="<<state <<"  laststate="<<laststate<<endl;
    3.32  
    3.33  	QString ch_org=quotemeta (ch);
    3.34      QString ch_simplified=ch.simplifyWhiteSpace();

     4.1 --- a/xml-vym.cpp	Wed Jan 16 15:45:19 2008 +0000
     4.2 +++ b/xml-vym.cpp	Wed Jan 16 15:45:20 2008 +0000
     4.3 @@ -56,7 +56,7 @@
     4.4  {
     4.5      QColor col;
     4.6  	/* Testing
     4.7 -	cout << "startElement <"<< eName.ascii()
     4.8 +	cout << "startElement <"<< qPrintable(eName)
     4.9  		<<">  state="<<state 
    4.10  		<<"  laststate="<<stateStack.last()
    4.11  		<<"   loadMode="<<loadMode
    4.12 @@ -68,6 +68,9 @@
    4.13  	{
    4.14          state = StateMap;
    4.15  
    4.16 +		if (loadMode==NewMap)
    4.17 +			model->clear();	// remove existing mapCenter
    4.18 +
    4.19  		// Check version
    4.20  		if (!atts.value( "version").isEmpty() ) 
    4.21  		{
    4.22 @@ -276,7 +279,7 @@
    4.23  bool parseVYMHandler::endElement  ( const QString&, const QString&, const QString &eName)
    4.24  {
    4.25  	/* Testing
    4.26 -	cout << "endElement </" <<eName.ascii()
    4.27 +	cout << "endElement </" <<qPrintable(eName)
    4.28  		<<">  state=" <<state 
    4.29  		<<"  laststate=" <<laststate
    4.30  		<<"  stateStack="<<stateStack.last() 

     5.1 --- a/xsltproc.cpp	Wed Jan 16 15:45:19 2008 +0000
     5.2 +++ b/xsltproc.cpp	Wed Jan 16 15:45:20 2008 +0000
     5.3 @@ -68,7 +68,7 @@
     5.4  	args << xslFile;
     5.5  	args << inputFile;
     5.6  	QString com=xsltprocessor+" "+args.join(" "); 
     5.7 -	if (debug) cout <<"xsltproc executing:\n"<<com.ascii()<<endl;
     5.8 +	if (debug) cout <<"xsltproc executing:\n"<<qPrintable(com)<<endl;
     5.9  	dia.append ("vym is executing: \n" + com );	
    5.10  	xsltProc->start(xsltprocessor,args);
    5.11  	if (!xsltProc->waitForStarted() )