Commit a29b78a79f4a767dc116a85d787c9f2ded674f17
1 parent
89c438fe
improved file error message
Showing
1 changed file
with
7 additions
and
5 deletions
sdk/core/qtutils.cpp
| @@ -74,18 +74,20 @@ QStringList QtUtils::readLines(const QString &file) | @@ -74,18 +74,20 @@ QStringList QtUtils::readLines(const QString &file) | ||
| 74 | 74 | ||
| 75 | void QtUtils::readFile(const QString &file, QStringList &lines) | 75 | void QtUtils::readFile(const QString &file, QStringList &lines) |
| 76 | { | 76 | { |
| 77 | - QFile f(file); | ||
| 78 | - if (!f.open(QFile::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file)); | ||
| 79 | - lines = QString(f.readAll()).split('\n', QString::SkipEmptyParts); | 77 | + QByteArray data; |
| 78 | + readFile(file, data); | ||
| 79 | + lines = QString(data).split('\n', QString::SkipEmptyParts); | ||
| 80 | for (int i=0; i<lines.size(); i++) | 80 | for (int i=0; i<lines.size(); i++) |
| 81 | lines[i] = lines[i].simplified(); | 81 | lines[i] = lines[i].simplified(); |
| 82 | - f.close(); | ||
| 83 | } | 82 | } |
| 84 | 83 | ||
| 85 | void QtUtils::readFile(const QString &file, QByteArray &data, bool uncompress) | 84 | void QtUtils::readFile(const QString &file, QByteArray &data, bool uncompress) |
| 86 | { | 85 | { |
| 87 | QFile f(file); | 86 | QFile f(file); |
| 88 | - if (!f.open(QFile::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file)); | 87 | + if (!f.open(QFile::ReadOnly)) { |
| 88 | + if (f.exists()) qFatal("Unable to open %s for reading. Check file permissions.", qPrintable(file)); | ||
| 89 | + else qFatal("Unable to open %s for reading. File does not exist.", qPrintable(file)); | ||
| 90 | + } | ||
| 89 | data = f.readAll(); | 91 | data = f.readAll(); |
| 90 | if (uncompress) data = qUncompress(data); | 92 | if (uncompress) data = qUncompress(data); |
| 91 | f.close(); | 93 | f.close(); |