Skip to content

fix ParserCSV build errors with Qt6 #4394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uklotzde merged 2 commits into from
Oct 13, 2021
Merged

fix ParserCSV build errors with Qt6 #4394

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4106b5f
explicitly construct QFileInfo from QString
Be-ing Oct 13, 2021
b46d298
ParserCSV: guard use of QTextStream::setCodec
Be-ing Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/library/parsercsv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ QList<QString> ParserCsv::parse(const QString& sFilename) {
for (int i = 1; i < tokens.size(); ++i) {
if (loc_coll < tokens[i].size()) {
// Todo: check if path is relative
QFileInfo fi = tokens[i][loc_coll];
QFileInfo fi(tokens[i][loc_coll]);
if (fi.isRelative()) {
// add base path
qDebug() << "is relative" << basepath << fi.filePath();
Expand Down Expand Up @@ -140,9 +140,14 @@ bool ParserCsv::writeCSVFile(const QString &file_str, BaseSqlTableModel* pPlayli

qDebug() << "Basepath: " << base;
QTextStream out(&file);
out.setCodec("UTF-8"); // rfc4180: Common usage of CSV is US-ASCII ...
// Using UTF-8 to get around codepage issues
// and it's the default encoding in Ooo Calc
// rfc4180: Common usage of CSV is US-ASCII ...
// Using UTF-8 to get around codepage issues
// and it's the default encoding in Ooo Calc
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
DEBUG_ASSERT(out.encoding() == QStringConverter::Utf8);
#else
out.setCodec("UTF-8");
#endif

// writing header section
bool first = true;
Expand Down