use QTextCodec::codecForLocale() where "System" is not available (lik…

…e android)
qgis · Jan 25, 2012 · 747e497 · 747e497
1 parent a30eb37
commit 747e497
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/src/app/ogr/qgsopenvectorlayerdialog.cpp b/src/app/ogr/qgsopenvectorlayerdialog.cpp
@@ -46,7 +46,7 @@ QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WFlags
   cmbEncodings->addItems( QgsVectorDataProvider::availableEncodings() );
 
   QSettings settings;
-  QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
+  QString enc = settings.value( "/UI/encoding", "System" ).toString();
 
   restoreGeometry( settings.value( "/Windows/OpenVectorLayer/geometry" ).toByteArray() );
 

diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -49,7 +49,7 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( QWidget* parent, Qt::WFl
 
   mEncodingComboBox->addItems( QgsVectorDataProvider::availableEncodings() );
 
-  QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
+  QString enc = settings.value( "/UI/encoding", "System" ).toString();
   int idx = mEncodingComboBox->findText( enc );
   if ( idx < 0 )
   {

diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -31,7 +31,7 @@ QgsVectorDataProvider::QgsVectorDataProvider( QString uri )
     , mFetchFeaturesWithoutGeom( true )
 {
   QSettings settings;
-  setEncoding( settings.value( "/UI/encoding", QString( "System" ) ).toString() );
+  setEncoding( settings.value( "/UI/encoding", "System" ).toString() );
 }
 
 
@@ -151,7 +151,7 @@ int QgsVectorDataProvider::capabilities() const
 
 void QgsVectorDataProvider::setEncoding( const QString& e )
 {
-  QTextCodec* ncodec = QTextCodec::codecForName( e.toLocal8Bit().data() );
+  QTextCodec* ncodec = QTextCodec::codecForName( e.toLocal8Bit().constData() );
   if ( ncodec )
   {
     mEncoding = ncodec;
@@ -160,6 +160,10 @@ void QgsVectorDataProvider::setEncoding( const QString& e )
   {
     QgsMessageLog::logMessage( tr( "Codec %1 not found. Falling back to system locale" ).arg( e ) );
     mEncoding = QTextCodec::codecForName( "System" );
+
+    if ( !mEncoding )
+      mEncoding = QTextCodec::codecForLocale();
+
     Q_ASSERT( mEncoding );
   }
 }

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -187,17 +187,19 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   QgsDebugMsg( "Created data source" );
 
   // use appropriate codec
-  mCodec = QTextCodec::codecForName( fileEncoding.toLocal8Bit().data() );
+  mCodec = QTextCodec::codecForName( fileEncoding.toLocal8Bit().constData() );
   if ( !mCodec )
   {
-    QSettings settings;
-    QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
     QgsDebugMsg( "error finding QTextCodec for " + fileEncoding );
-    mCodec = QTextCodec::codecForName( enc.toLocal8Bit().data() );
+
+    QSettings settings;
+    QString enc = settings.value( "/UI/encoding", "System" ).toString();
+    mCodec = QTextCodec::codecForName( enc.toLocal8Bit().constData() );
     if ( !mCodec )
     {
       QgsDebugMsg( "error finding QTextCodec for " + enc );
       mCodec = QTextCodec::codecForLocale();
+      Q_ASSERT( mCodec );
     }
   }
 

diff --git a/src/gui/qgsencodingfiledialog.cpp b/src/gui/qgsencodingfiledialog.cpp
@@ -44,7 +44,7 @@ QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget * parent,
   if ( encoding.isEmpty() )
   {
     QSettings settings;
-    enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
+    enc = settings.value( "/UI/encoding", "System" ).toString();
   }
 
   // The specified decoding is added if not existing alread, and then set current.

diff --git a/src/plugins/spit/qgsshapefile.cpp b/src/plugins/spit/qgsshapefile.cpp
@@ -59,9 +59,10 @@ QgsShapeFile::QgsShapeFile( QString name, QString encoding )
   geometries << "NULL" << "POINT" << "LINESTRING" << "POLYGON" << "MULTIPOINT"
   << "MULTILINESTRING" << "MULTIPOLYGON" << "GEOMETRYCOLLECTION";
 
-  codec = QTextCodec::codecForName( encoding.toLocal8Bit().data() );
+  codec = QTextCodec::codecForName( encoding.toLocal8Bit().constData() );
   if ( !codec )
     codec = QTextCodec::codecForLocale();
+  Q_ASSERT( codec );
 }
 
 QgsShapeFile::~QgsShapeFile()