Skip to content

Commit 0ae2043

Browse files
author
jef
committed
fix #2029
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11833 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e704040 commit 0ae2043

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/app/qgsattributetypedialog.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <QFile>
2828
#include <QMessageBox>
2929
#include <QFileDialog>
30+
#include <QTextStream>
3031

3132
#include <climits>
3233
#include <cfloat>
@@ -120,21 +121,25 @@ void QgsAttributeTypeDialog::loadFromCSVButtonPushed()
120121
{
121122
QMessageBox::information( NULL,
122123
tr( "Error" ),
123-
tr( "Could not open file %1\nError was:%2" ).arg( fileName ).arg( f.errorString() ), QMessageBox::Cancel );
124+
tr( "Could not open file %1\nError was:%2" ).arg( fileName ).arg( f.errorString() ),
125+
QMessageBox::Cancel );
124126
return;
125127
}
126128

129+
QTextStream s(&f);
130+
s.setAutoDetectUnicode(true);
131+
127132
QRegExp re0( "^([^;]*);(.*)$" );
128133
re0.setMinimal( true );
129134
QRegExp re1( "^([^,]*),(.*)$" );
130135
re1.setMinimal( true );
131136
QMap<QString, QVariant> map;
132137

133-
f.readLine();
138+
s.readLine();
134139

135-
while ( !f.atEnd() )
140+
while ( !s.atEnd() )
136141
{
137-
QString l = f.readLine().trimmed();
142+
QString l = s.readLine().trimmed();
138143

139144
QString key, val;
140145
if ( re0.indexIn( l ) >= 0 && re0.numCaptures() == 2 )

0 commit comments

Comments
 (0)