From 0a65bcb9510f28808f70fc444afff09df538dbbb Mon Sep 17 00:00:00 2001 From: gsherman Date: Sat, 27 Nov 2004 19:19:17 +0000 Subject: [PATCH] Removed all calls to ascii() to hopefully solve utf-8/latin string issue git-svn-id: http://svn.osgeo.org/qgis/trunk@2355 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/qgisapp.cpp | 12 ++++---- src/qgscontinuouscolrenderer.cpp | 42 ++++++++++++------------- src/qgsdlgvectorlayerproperties.cpp | 2 +- src/qgsexception.h | 2 +- src/qgsgraduatedsymrenderer.cpp | 24 +++++++-------- src/qgslabel.cpp | 36 +++++++++++----------- src/qgslegend.cpp | 2 +- src/qgsmaplayer.cpp | 4 +-- src/qgspluginmanager.cpp | 14 ++++----- src/qgsproject.cpp | 48 ++++++++++++++--------------- src/qgsrasterlayer.cpp | 4 +-- src/qgssinglesymrenderer.cpp | 6 ++-- src/qgssvgcache.cpp | 4 +-- src/qgsuniquevalrenderer.cpp | 22 ++++++------- src/qgsvectorlayer.cpp | 4 +-- 15 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp index e9ceb74f970..cdc058fb1e1 100644 --- a/src/qgisapp.cpp +++ b/src/qgisapp.cpp @@ -621,7 +621,7 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString) QString myFullPath = thePluginDirString + "/" + myPluginDir[i]; #ifdef QGISDEBUG - std::cerr << "Examining " << myFullPath.ascii() << std::endl; + std::cerr << "Examining " << myFullPath << std::endl; #endif QLibrary *myLib = new QLibrary(myFullPath); @@ -629,7 +629,7 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString) if (loaded) { //purposely leaving this one to stdout! - std::cout << "Loaded " << myLib->library().ascii() << std::endl; + std::cout << "Loaded " << myLib->library() << std::endl; name_t * myName =(name_t *) myLib->resolve("name"); description_t * myDescription = (description_t *) myLib->resolve("description"); version_t * myVersion = (version_t *) myLib->resolve("version"); @@ -643,7 +643,7 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString) if (mySettings.readBoolEntry("/qgis/Plugins/" + myEntryName)) { #ifdef QGISDEBUG - std::cerr << " -------------------- loading " << myEntryName.ascii() << std::endl; + std::cerr << " -------------------- loading " << myEntryName << std::endl; #endif loadPlugin(myName(), myDescription(), myFullPath); @@ -652,14 +652,14 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString) else { #ifdef QGISDEBUG - std::cerr << "Failed to get name, description, or type for " << myLib->library().ascii() << std::endl; + std::cerr << "Failed to get name, description, or type for " << myLib->library() << std::endl; #endif } } else { - std::cerr << "Failed to load " << myLib->library().ascii() << std::endl; + std::cerr << "Failed to load " << myLib->library() << std::endl; } } } @@ -2432,7 +2432,7 @@ void QgisApp::loadPlugin(QString name, QString description, QString theFullPathN QLibrary *myLib = new QLibrary(theFullPathName); #ifdef QGISDEBUG - std::cerr << "Library name is " << myLib->library().ascii() << std::endl; + std::cerr << "Library name is " << myLib->library() << std::endl; #endif bool loaded = myLib->load(); diff --git a/src/qgscontinuouscolrenderer.cpp b/src/qgscontinuouscolrenderer.cpp index 73edb9347d9..0ec6ebfe2ab 100644 --- a/src/qgscontinuouscolrenderer.cpp +++ b/src/qgscontinuouscolrenderer.cpp @@ -328,7 +328,7 @@ void QgsContinuousColRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl void QgsContinuousColRenderer::writeXML(std::ostream& xml) { xml << "\t\t\n"; - xml << "\t\t\t" << QString::number(this->classificationField()).ascii() << + xml << "\t\t\t" << QString::number(this->classificationField()) << "\n"; @@ -336,24 +336,24 @@ void QgsContinuousColRenderer::writeXML(std::ostream& xml) QgsSymbol *lsymbol = lowestitem->getSymbol(); xml << "\t\t\t\n"; xml << "\t\t\t\t\n"; - xml << "\t\t\t\t" << lowestitem->value().ascii() << "\n"; + xml << "\t\t\t\t" << lowestitem->value() << "\n"; xml << "\t\t\t\t\t\n"; xml << "\t\t\t\t\t\tpen().color().red()).ascii() + << QString::number(lsymbol->pen().color().red()) << "\" green=\"" - << QString::number(lsymbol->pen().color().green()).ascii() + << QString::number(lsymbol->pen().color().green()) << "\" blue=\"" - << QString::number(lsymbol->pen().color().blue()).ascii() + << QString::number(lsymbol->pen().color().blue()) << "\" />\n"; - xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(lsymbol->pen().style()).ascii() << "\n"; - xml << "\t\t\t\t\t\t" << QString::number(lsymbol->pen().width()).ascii() << "\n"; - xml << "\t\t\t\t\t\tbrush().color().red()).ascii() << "\" green=\"" << - QString::number(lsymbol->brush().color().green()).ascii() << "\" blue=\"" << - QString::number(lsymbol->brush().color().blue()).ascii() << "\" />\n"; - xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(lsymbol->brush().style()).ascii() << + xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(lsymbol->pen().style()) << "\n"; + xml << "\t\t\t\t\t\t" << QString::number(lsymbol->pen().width()) << "\n"; + xml << "\t\t\t\t\t\tbrush().color().red()) << "\" green=\"" << + QString::number(lsymbol->brush().color().green()) << "\" blue=\"" << + QString::number(lsymbol->brush().color().blue()) << "\" />\n"; + xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(lsymbol->brush().style()) << "\n"; xml << "\t\t\t\t\t\n"; - xml << "\t\t\t\t\t\n"; + xml << "\t\t\t\t\t\n"; xml << "\t\t\t\t\n"; xml << "\t\t\t\n"; @@ -363,19 +363,19 @@ void QgsContinuousColRenderer::writeXML(std::ostream& xml) xml << "\t\t\t\t\n"; xml << "\t\t\t\t" << highestitem->value() << "\n"; xml << "\t\t\t\t\t\n"; - xml << "\t\t\t\t\t\tpen().color().red()).ascii() << "\" green=\"" << - QString::number(hsymbol->pen().color().green()).ascii() << "\" blue=\"" << QString::number(hsymbol->pen().color().blue()).ascii() << + xml << "\t\t\t\t\t\tpen().color().red()) << "\" green=\"" << + QString::number(hsymbol->pen().color().green()) << "\" blue=\"" << QString::number(hsymbol->pen().color().blue()) << "\" />\n"; - xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(hsymbol->pen().style()).ascii() << + xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(hsymbol->pen().style()) << "\n"; - xml << "\t\t\t\t\t\t" << QString::number(hsymbol->pen().width()).ascii() << "\n"; - xml << "\t\t\t\t\t\tbrush().color().red()).ascii() << "\" green=\"" << - QString::number(hsymbol->brush().color().green()).ascii() << "\" blue=\"" << - QString::number(hsymbol->brush().color().blue()).ascii() << "\" />\n"; - xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(hsymbol->brush().style()).ascii() << + xml << "\t\t\t\t\t\t" << QString::number(hsymbol->pen().width()) << "\n"; + xml << "\t\t\t\t\t\tbrush().color().red()) << "\" green=\"" << + QString::number(hsymbol->brush().color().green()) << "\" blue=\"" << + QString::number(hsymbol->brush().color().blue()) << "\" />\n"; + xml << "\t\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(hsymbol->brush().style()) << "\n"; xml << "\t\t\t\t\t\n"; - xml << "\t\t\t\t\t\n"; + xml << "\t\t\t\t\t\n"; xml << "\t\t\t\t\n"; xml << "\t\t\t\n"; xml << "\t\t\n"; diff --git a/src/qgsdlgvectorlayerproperties.cpp b/src/qgsdlgvectorlayerproperties.cpp index f770498c1e3..3bced0e3688 100644 --- a/src/qgsdlgvectorlayerproperties.cpp +++ b/src/qgsdlgvectorlayerproperties.cpp @@ -164,7 +164,7 @@ void QgsDlgVectorLayerProperties::alterLayerDialog(const QString & dialogString) { #ifdef QGISDEBUG qDebug( "%s:%d QgsDlgVectorLayerProperties::alterLayerDialog(%s)", - __FILE__, __LINE__, dialogString.ascii() ); + __FILE__, __LINE__, dialogString ); #endif if (rendererDirty) { diff --git a/src/qgsexception.h b/src/qgsexception.h index 7e267f5300b..006eabf4f6b 100644 --- a/src/qgsexception.h +++ b/src/qgsexception.h @@ -35,7 +35,7 @@ public: {} QgsException( QString const & what ) - : what_( what.ascii() ) + : what_( (const char *)what ) {} virtual ~QgsException() throw() diff --git a/src/qgsgraduatedsymrenderer.cpp b/src/qgsgraduatedsymrenderer.cpp index 009e220862f..a6288884180 100644 --- a/src/qgsgraduatedsymrenderer.cpp +++ b/src/qgsgraduatedsymrenderer.cpp @@ -188,29 +188,29 @@ void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl) void QgsGraduatedSymRenderer::writeXML(std::ostream& xml) { xml << "\t\t\n"; - xml << "\t\t\t" << QString::number(this->classificationField()).ascii() << + xml << "\t\t\t" << QString::number(this->classificationField()) << "\n"; for (std::list < QgsRangeRenderItem * >::iterator it = this->items().begin(); it != this->items().end(); ++it) { xml << "\t\t\t\n"; - xml << "\t\t\t\t" << (*it)->value().ascii() << "\n"; - xml << "\t\t\t\t" << (*it)->upper_value().ascii() << "\n"; + xml << "\t\t\t\t" << (*it)->value() << "\n"; + xml << "\t\t\t\t" << (*it)->upper_value() << "\n"; xml << "\t\t\t\t\n"; QgsSymbol *symbol = (*it)->getSymbol(); - xml << "\t\t\t\t\tpen().color().red()).ascii() << "\" green=\"" << - QString::number(symbol->pen().color().green()).ascii() << "\" blue=\"" << QString::number(symbol->pen().color().blue()).ascii() << + xml << "\t\t\t\t\tpen().color().red()) << "\" green=\"" << + QString::number(symbol->pen().color().green()) << "\" blue=\"" << QString::number(symbol->pen().color().blue()) << "\" />\n"; - xml << "\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(symbol->pen().style()).ascii() << + xml << "\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(symbol->pen().style()) << "\n"; - xml << "\t\t\t\t\t" << QString::number(symbol->pen().width()).ascii() << "\n"; - xml << "\t\t\t\t\tbrush().color().red()).ascii() << "\" green=\"" << - QString::number(symbol->brush().color().green()).ascii() << "\" blue=\"" << - QString::number(symbol->brush().color().blue()).ascii() << "\" />\n"; - xml << "\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(symbol->brush().style()).ascii() << + xml << "\t\t\t\t\t" << QString::number(symbol->pen().width()) << "\n"; + xml << "\t\t\t\t\tbrush().color().red()) << "\" green=\"" << + QString::number(symbol->brush().color().green()) << "\" blue=\"" << + QString::number(symbol->brush().color().blue()) << "\" />\n"; + xml << "\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(symbol->brush().style()) << "\n"; xml << "\t\t\t\t\n"; - xml << "\t\t\t\t\n"; + xml << "\t\t\t\t\n"; xml << "\t\t\t\n"; } xml << "\t\t\n"; diff --git a/src/qgslabel.cpp b/src/qgslabel.cpp index 195cfc963c0..b59d30a8968 100644 --- a/src/qgslabel.cpp +++ b/src/qgslabel.cpp @@ -614,55 +614,55 @@ void QgsLabel::writeXML(std::ostream& xml) xml << "\t\t\n"; /* Text */ - xml << "\t\t\t\n"; } diff --git a/src/qgslegend.cpp b/src/qgslegend.cpp index 7cbf15a03cd..c4a29875152 100644 --- a/src/qgslegend.cpp +++ b/src/qgslegend.cpp @@ -212,7 +212,7 @@ void QgsLegend::addLayer(QgsMapLayer * layer) layer->initContextMenu(mQgisApp); - const char * layerName = layer->name().ascii(); // debugger probe + const char * layerName = layer->name(); // debugger probe QgsLegendItem *legend_item = new QgsLegendItem(layer, this, mQgisApp->actionInOverview); diff --git a/src/qgsmaplayer.cpp b/src/qgsmaplayer.cpp index 7ddd7d5405e..fb1ae821e9c 100644 --- a/src/qgsmaplayer.cpp +++ b/src/qgsmaplayer.cpp @@ -190,7 +190,7 @@ bool QgsMapLayer::readXML( QDomNode & layer_node ) QDomElement mne = mnl.toElement(); dataSource = mne.text(); - const char * dataSourceStr = dataSource.ascii(); // debugger probe + const char * dataSourceStr = dataSource; // debugger probe // the internal name is just the data source basename QFileInfo dataSourceFileInfo( dataSource ); @@ -201,7 +201,7 @@ bool QgsMapLayer::readXML( QDomNode & layer_node ) mne = mnl.toElement(); setLayerName( mne.text() ); - const char * layerNameStr = mne.text().ascii(); // debugger probe + const char * layerNameStr = mne.text(); // debugger probe // process zorder mnl = layer_node.namedItem("zorder"); diff --git a/src/qgspluginmanager.cpp b/src/qgspluginmanager.cpp index 9e01075dee0..37b38d1c791 100644 --- a/src/qgspluginmanager.cpp +++ b/src/qgspluginmanager.cpp @@ -102,29 +102,29 @@ sharedLibExtension = "*.so*"; #endif //#ifdef TESTLIB - std::cout << "Examining " << txtPluginDir->text().ascii() << "/" << pluginDir[i].ascii() << std::endl; + std::cout << "Examining " << txtPluginDir->text() << "/" << pluginDir[i] << std::endl; QLibrary *myLib = new QLibrary(txtPluginDir->text() + "/" + pluginDir[i]); bool loaded = myLib->load(); if (loaded) { - std::cout << "Loaded " << myLib->library().ascii() << std::endl; + std::cout << "Loaded " << myLib->library() << std::endl; name_t *pName = (name_t *) myLib->resolve("name"); description_t *pDesc = (description_t *) myLib->resolve("description"); version_t *pVersion = (version_t *) myLib->resolve("version"); #ifdef QGISDEBUG // show the values (or lack of) for each function if(pName){ - std::cout << "Plugin name: " << pName().ascii() << std::endl; + std::cout << "Plugin name: " << pName() << std::endl; }else{ std::cout << "Plugin name not returned when queried\n"; } if(pDesc){ - std::cout << "Plugin description: " << pDesc().ascii() << std::endl; + std::cout << "Plugin description: " << pDesc() << std::endl; }else{ std::cout << "Plugin description not returned when queried\n"; } if(pVersion){ - std::cout << "Plugin version: " << pVersion().ascii() << std::endl; + std::cout << "Plugin version: " << pVersion() << std::endl; }else{ std::cout << "Plugin version not returned when queried\n"; } @@ -159,11 +159,11 @@ sharedLibExtension = "*.so*"; } } else { - std::cout << "Failed to get name, description, or type for " << myLib->library().ascii() << std::endl; + std::cout << "Failed to get name, description, or type for " << myLib->library() << std::endl; } } else { - std::cout << "Failed to load " << myLib->library().ascii() << std::endl; + std::cout << "Failed to load " << myLib->library() << std::endl; } } } diff --git a/src/qgsproject.cpp b/src/qgsproject.cpp index 5a4d8574276..2d90d042c8a 100644 --- a/src/qgsproject.cpp +++ b/src/qgsproject.cpp @@ -204,12 +204,12 @@ public: i != sl.end(); ++i ) { - qDebug( "[%s] ", (*i).ascii() ); + qDebug( "[%s] ", (*i) ); } } else { - qDebug( "%s", value_.toString().ascii() ); + qDebug( "%s", value_.toString() ); } } @@ -244,7 +244,7 @@ public: if ( QString::null == typeString ) { qDebug( "%s:%d null ``type'' attribute for %s", - __FILE__, __LINE__, keyNode.nodeName().ascii() ); + __FILE__, __LINE__, keyNode.nodeName() ); return false; } @@ -267,7 +267,7 @@ public: { case QVariant::Invalid : qDebug( "%s:%d invalid value type %s .. ", - __FILE__, __LINE__, typeString.ascii() ); + __FILE__, __LINE__, typeString ); return false; @@ -308,7 +308,7 @@ public: else { qDebug( "qgsproject.cpp:%d non element ``%s'' in string list", - __LINE__, values.item(i).nodeName().ascii() ); + __LINE__, values.item(i).nodeName() ); } ++i; @@ -514,7 +514,7 @@ public: default : qDebug( "%s:%d unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp:%d", - __FILE__, __LINE__, typeString.ascii() ); + __FILE__, __LINE__, typeString ); } return true; @@ -696,9 +696,9 @@ public: { for ( QDictIterator i(properties_); i.current(); ++i ) { - qDebug( "<%s>", i.currentKey().ascii() ); + qDebug( "<%s>", i.currentKey() ); i.current()->dump( ); - qDebug( "", i.currentKey().ascii() ); + qDebug( "", i.currentKey() ); } } @@ -733,7 +733,7 @@ public: else { qDebug( "%s:%d cannot find key %s to remove", - __FILE__, __LINE__, currentKey.ascii() ); + __FILE__, __LINE__, currentKey ); return false; } @@ -764,7 +764,7 @@ public: if ( ! properties_[subkeys.item(i).nodeName()]->readXML( subkey ) ) { qDebug( "%s:%d unable to parse key value %s", - __FILE__, __LINE__, subkeys.item(i).nodeName().ascii() ); + __FILE__, __LINE__, subkeys.item(i).nodeName() ); } } else // otherwise it's a subkey, so just recurse on down the remaining keys @@ -776,7 +776,7 @@ public: if ( ! properties_[subkeys.item(i).nodeName()]->readXML( subkey) ) { qDebug( "%s:%d unable to parse subkey %s", - __FILE__, __LINE__, subkeys.item(i).nodeName().ascii() ); + __FILE__, __LINE__, subkeys.item(i).nodeName() ); } } @@ -960,9 +960,9 @@ dump_( QMap< QString, PropertyKey > const & property_list ) curr_scope != property_list.end(); curr_scope++ ) { - qDebug( "<%s>", curr_scope.key().ascii() ); + qDebug( "<%s>", curr_scope.key() ); curr_scope.data().dump( ); - qDebug( "", curr_scope.key().ascii() ); + qDebug( "", curr_scope.key() ); } } // dump_ @@ -1046,9 +1046,9 @@ _getScopeProperties( QDomNode const & scopeNode, QDomNode currentValue = currentProperty.firstChild(); // should only have one child qDebug( "Got property %s:%s (%s)", - currentProperty.nodeName().ascii(), - currentValue.nodeValue().ascii(), - currentProperty.toElement().attributeNode("type").value().ascii() ); + currentProperty.nodeName(), + currentValue.nodeValue(), + currentProperty.toElement().attributeNode("type").value() ); // the values come in as strings; we need to restore them to their // original values *and* types @@ -1063,7 +1063,7 @@ _getScopeProperties( QDomNode const & scopeNode, case QVariant::Invalid : qDebug( "qgsproject.cpp:%d invalid value type %s .. ", __LINE__, - currentProperty.toElement().attributeNode("type").value().ascii() ); + currentProperty.toElement().attributeNode("type").value() ); restoredValue.clear(); @@ -1211,7 +1211,7 @@ _getScopeProperties( QDomNode const & scopeNode, default : qDebug( "unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp:%d", - currentProperty.toElement().attributeNode("type").value().ascii(), + currentProperty.toElement().attributeNode("type").value(), __LINE__ ); restoredValue.clear(); @@ -1292,14 +1292,14 @@ _getProperties( QDomDocument const & doc, QMap< QString, PropertyKey > & project qDebug( "found %d property node(s) for scope %s", curr_scope_node.childNodes().count(), - curr_scope_node.nodeName().ascii() ); + curr_scope_node.nodeName() ); // DEPRECATED _getScopeProperties( curr_scope_node, project_properties ); if ( ! project_properties[curr_scope_node.nodeName()].readXML( curr_scope_node ) ) { qDebug ("%s:%d unable to read XML for property %s", - __FILE__, __LINE__, curr_scope_node.nodeName().ascii() ); + __FILE__, __LINE__, curr_scope_node.nodeName() ); } ++i; @@ -1765,7 +1765,7 @@ QgsProject::read( ) imp_->file.close(); - throw QgsException( errorString + " for file " + imp_->file.name().ascii() ); + throw QgsException( errorString + " for file " + imp_->file.name() ); return false; // XXX superfluous because of exception } @@ -1948,13 +1948,13 @@ QgsProject::write( ) curr_scope != imp_->properties_.end(); curr_scope++ ) { - qDebug( "scope ``%s'' has %d entries", curr_scope.key().ascii(), curr_scope.data().count() ); + qDebug( "scope ``%s'' has %d entries", curr_scope.key(), curr_scope.data().count() ); // <$scope> if ( ! curr_scope.data().writeXML( curr_scope.key(), propertiesElement, *doc ) ) { qDebug ( "%s:%d error create property %s's DOM objects", - __FILE__, __LINE__, curr_scope.key().ascii() ); + __FILE__, __LINE__, curr_scope.key() ); } // @@ -1970,7 +1970,7 @@ QgsProject::write( ) QString xml = doc->toString( 4 ); // write to string with indentation of four characters // (yes, four is arbitrary) - // const char * xmlString = xml.ascii(); // debugger probe point + // const char * xmlString = xml; // debugger probe point // qDebug( "project file output:\n\n" + xml ); QTextStream projectFileStream( &imp_->file ); diff --git a/src/qgsrasterlayer.cpp b/src/qgsrasterlayer.cpp index 63d6659161a..6a6a1874151 100644 --- a/src/qgsrasterlayer.cpp +++ b/src/qgsrasterlayer.cpp @@ -3330,7 +3330,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node ) myElement = snode.toElement(); setGrayBandName(myElement.text()); - const char * sourceNameStr = source().ascii(); // debugger probe + const char * sourceNameStr = source(); // debugger probe if ( ! readFile( source() ) ) // Data source name set in // QgsMapLayer::readXML() @@ -3357,7 +3357,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node ) if ( mapLayerNode.isNull() || ("maplayer" != mapLayerNode.nodeName()) ) { - const char * nn = mapLayerNode.nodeName().ascii(); // debugger probe + const char * nn = mapLayerNode.nodeName(); // debugger probe qDebug( "QgsRasterLayer::writeXML() can't find " ); diff --git a/src/qgssinglesymrenderer.cpp b/src/qgssinglesymrenderer.cpp index 76379dab31c..0165a84e631 100644 --- a/src/qgssinglesymrenderer.cpp +++ b/src/qgssinglesymrenderer.cpp @@ -211,16 +211,16 @@ void QgsSingleSymRenderer::writeXML(std::ostream& xml) { xml << "\t\t\n"; xml << "\t\t\t\n"; - xml << "\t\t\t\t" << this->item()->value().ascii() << "\n"; + xml << "\t\t\t\t" << this->item()->value() << "\n"; QgsSymbol *symbol = this->item()->getSymbol(); xml << "\t\t\t\t\n"; xml << "\t\t\t\t\tpen().color().red() << "\" green=\"" - << QString::number(symbol->pen().color().green()).ascii() + << QString::number(symbol->pen().color().green()) << "\" blue=\"" - << QString::number(symbol->pen().color().blue()).ascii() + << QString::number(symbol->pen().color().blue()) << "\" />\n"; xml << "\t\t\t\t\t" << (const char *)QgsSymbologyUtils::penStyle2QString(symbol->pen().style()) << "\n"; xml << "\t\t\t\t\t" << symbol->pen().width() << "\n"; diff --git a/src/qgssvgcache.cpp b/src/qgssvgcache.cpp index fef2f6de858..a4767329195 100644 --- a/src/qgssvgcache.cpp +++ b/src/qgssvgcache.cpp @@ -46,13 +46,13 @@ QPixmap QgsSVGCache::getPixmap(QString filename, double scaleFactor) { // if we already have the pixmap, return it if (iter != pixmapMap.end()) { - std::cerr<<"SVGCACHE: "<second; } // if not, try to load it - std::cerr<<"SVGCACHE: loading "<\n"; - xml << "\t\t\t" << QString::number(this->classificationField()).ascii() << "\n"; + xml << "\t\t\t" << QString::number(this->classificationField()) << "\n"; for(std::map::iterator it=mEntries.begin();it!=mEntries.end();++it) { xml << "\t\t\t\n"; - xml << "\t\t\t\t" << QString(it->first).ascii() << "\n"; + xml << "\t\t\t\t" << QString(it->first) << "\n"; xml << "\t\t\t\t\n"; QgsSymbol *symbol = (it->second)->getSymbol(); - xml << "\t\t\t\t\tpen().color().red()).ascii() << "\" green=\"" << - QString::number(symbol->pen().color().green()).ascii() << "\" blue=\"" << QString::number(symbol->pen().color().blue()).ascii() << + xml << "\t\t\t\t\tpen().color().red()) << "\" green=\"" << + QString::number(symbol->pen().color().green()) << "\" blue=\"" << QString::number(symbol->pen().color().blue()) << "\" />\n"; - xml << "\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(symbol->pen().style()).ascii() << + xml << "\t\t\t\t\t" << QgsSymbologyUtils::penStyle2QString(symbol->pen().style()) << "\n"; - xml << "\t\t\t\t\t" << QString::number(symbol->pen().width()).ascii() << "\n"; - xml << "\t\t\t\t\tbrush().color().red()).ascii() << "\" green=\"" << - QString::number(symbol->brush().color().green()).ascii() << "\" blue=\"" << - QString::number(symbol->brush().color().blue()).ascii() << "\" />\n"; - xml << "\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(symbol->brush().style()).ascii() << + xml << "\t\t\t\t\t" << QString::number(symbol->pen().width()) << "\n"; + xml << "\t\t\t\t\tbrush().color().red()) << "\" green=\"" << + QString::number(symbol->brush().color().green()) << "\" blue=\"" << + QString::number(symbol->brush().color().blue()) << "\" />\n"; + xml << "\t\t\t\t\t" << QgsSymbologyUtils::brushStyle2QString(symbol->brush().style()) << "\n"; xml << "\t\t\t\t\n"; - xml << "\t\t\t\t\n"; + xml << "\t\t\t\t\n"; #ifdef QGISDEBUG qWarning((it->second)->label()); #endif diff --git a/src/qgsvectorlayer.cpp b/src/qgsvectorlayer.cpp index 639cef00881..9c67a80d8bb 100644 --- a/src/qgsvectorlayer.cpp +++ b/src/qgsvectorlayer.cpp @@ -452,7 +452,7 @@ int QgsVectorLayer::endian() for (int i = 0; i < attr.size(); i++) { #ifdef QGISDEBUG - std::cout << attr[i].fieldName().ascii() << " == " << fieldIndex.ascii() << std::endl; + std::cout << attr[i].fieldName() << " == " << fieldIndex << std::endl; #endif if (attr[i].fieldName().lower() == fieldIndex) { @@ -1578,7 +1578,7 @@ QgsVectorLayer:: setDataProvider( QString const & provider ) if ( mapLayerNode.isNull() || ("maplayer" != mapLayerNode.nodeName()) ) { - const char * nn = mapLayerNode.nodeName().ascii(); // debugger probe + const char * nn = mapLayerNode.nodeName(); // debugger probe qDebug( "QgsVectorLayer::writeXML() can't find " );