feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BinEditor: Complain about missing file, not empty size

Browse Source 
When trying to open a non-existing file with the binary editor, it would
complain that it couldn't empty files, instead of complaining that the
file does not exist.

Change-Id: I50fc8afb8c59cad211ee68356020a81891708097
Task-number: QTCREATORBUG-14078
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-03 08:17:21 +01:00
parent 9abfd712aa
commit 706d78b58d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -267,8 +267,10 @@ public:
bool open(QString *errorString, const QString &fileName, quint64 offset = 0) { bool open(QString *errorString, const QString &fileName, quint64 offset = 0) {
QFile file(fileName); QFile file(fileName);
if (file.open(QIODevice::ReadOnly)) {
file.close();
quint64 size = static_cast<quint64>(file.size()); quint64 size = static_cast<quint64>(file.size());
if (size == 0 && !fileName.isEmpty()) { if (size == 0) {
QString msg = tr("The Binary Editor cannot open empty files."); QString msg = tr("The Binary Editor cannot open empty files.");
if (errorString) if (errorString)
*errorString = msg; *errorString = msg;
@@ -278,8 +280,6 @@ public:
} }
if (offset >= size) if (offset >= size)
return false; return false;
if (file.open(QIODevice::ReadOnly)) {
file.close();
setFilePath(FileName::fromString(fileName)); setFilePath(FileName::fromString(fileName));
m_widget->setSizes(offset, file.size()); m_widget->setSizes(offset, file.size());
return true; return true;