The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-14 11:06:19 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store default database and recently opened file as UTF8

Browse Source
This commit is contained in:
Christian Hohnstaedt 2020-03-14 08:10:31 +01:00
parent 00bf676f0a
commit 9845a00ca3
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/database_model.cpp
View File

@ -422,13 +422,9 @@ void database_model::as_default_database(const QString &db)
}
if (file.open(QIODevice::ReadWrite)) {
QByteArray ba;
if (isRemoteDB(db))
ba = filename2bytearray(db);
else
ba = filename2bytearray(relativePath(db));
ba += '\n';
file.write(ba);
QByteArray ba = isRemoteDB(db) ?
db.toUtf8() : relativePath(db).toUtf8();
file.write(ba + '\n');
/* write() failed? Harmless. Only inconvenient */
}
file.close();

12
lib/dbhistory.cpp
View File

@ -33,7 +33,7 @@ dbhistory::dbhistory()
ssize_t size = file.readLine(buf, sizeof buf);
if (size <= 0)
break;
name = filename2QString(buf).trimmed();
name = QString::fromUtf8(buf).trimmed();
if (name.size() == 0)
continue;
if (history.indexOf(name) == -1)
@ -72,12 +72,10 @@ void dbhistory::addEntry(const QString &name)
if (!file.open_write())
return;
for (pos = 0; pos < history.size(); pos++) {
QByteArray ba = filename2bytearray(history[pos]);
ba.append('\n');
if (file.write(ba) <= 0)
break;
}
QString all = history.join("\n");
if (file.write(all.toUtf8()) <= 0)
qDebug() << "Error writing history" << file.fileName()
<< file.errorString();
file.close();
}