Navigation Menu

Skip to content

Commit

Permalink
[delimitedtext] Fix compilation against qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn committed Jul 17, 2021
1 parent d10695c commit a2e8fbd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/providers/delimitedtext/qgsdelimitedtextfile.cpp
Expand Up @@ -33,6 +33,7 @@
QgsDelimitedTextFile::QgsDelimitedTextFile( const QString &url )
: mFileName( QString() )
, mEncoding( QStringLiteral( "UTF-8" ) )
, mFirstEOLChar( QChar( 0 ) )
, mDefaultFieldName( QStringLiteral( "field_%1" ) )
, mDefaultFieldRegexp( QStringLiteral( "^(?:field_)(\\d+)$" ) )
{
Expand Down Expand Up @@ -778,7 +779,7 @@ QgsDelimitedTextFile::Status QgsDelimitedTextFile::parseQuoted( QString &buffer,
QString field; // String in which to accumulate next field
bool escaped = false; // Next char is escaped
bool quoted = false; // In quotes
QChar quoteChar = 0; // Actual quote character used to open quotes
QChar quoteChar( 0 ); // Actual quote character used to open quotes
bool started = false; // Non-blank chars in field or quotes started
bool ended = false; // Quoted field ended
int cp = 0; // Pointer to the next character in the buffer
Expand Down
2 changes: 1 addition & 1 deletion src/providers/delimitedtext/qgsdelimitedtextfile.h
Expand Up @@ -432,7 +432,7 @@ class QgsDelimitedTextFile : public QObject
QString mBuffer;
int mPosInBuffer = 0;
int mMaxBufferSize = 0;
QChar mFirstEOLChar = 0; // '\r' if EOL is "\r" or "\r\n", or `\n' if EOL is "\n"
QChar mFirstEOLChar; // '\r' if EOL is "\r" or "\r\n", or `\n' if EOL is "\n"
QStringList mCurrentRecord;
bool mHoldCurrentRecord = false;
// Maximum number of record (ie maximum record number visited)
Expand Down

0 comments on commit a2e8fbd

Please sign in to comment.