debugger: work on writable memory view

3 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp
index 06e0d61da7..19588d4ba7 100644
--- a/src/plugins/bineditor/bineditor.cpp
+++ b/src/plugins/bineditor/bineditor.cpp
@@ -204,7 +204,7 @@ bool BinEditor::requestOldDataAt(int pos) const
 char BinEditor::dataAt(int pos, bool old) const
 {
     int block = pos / m_blockSize;
-    return blockData(block, old).at(pos - (block*m_blockSize));
+    return blockData(block, old).at(pos - block*m_blockSize);
 }
 
 void BinEditor::changeDataAt(int pos, char c)
@@ -221,6 +221,8 @@ void BinEditor::changeDataAt(int pos, char c)
             m_modifiedData.insert(block, data);
         }
     }
+
+    emit dataChanged(editor(), m_baseAddr + pos, QByteArray(1, c));
 }
 
 QByteArray BinEditor::dataMid(int from, int length, bool old) const
diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h
index 0ddffc7d37..d6518f2647 100644
--- a/src/plugins/bineditor/bineditor.h
+++ b/src/plugins/bineditor/bineditor.h
@@ -136,6 +136,7 @@ Q_SIGNALS:
     void newRangeRequested(Core::IEditor *, quint64 address);
     void startOfFileRequested(Core::IEditor *);
     void endOfFileRequested(Core::IEditor *);
+    void dataChanged(Core::IEditor *, quint64 address, const QByteArray &data);
 
 protected:
     void scrollContentsBy(int dx, int dy);
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 72fbb0d415..68a46cc4f4 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -179,8 +179,7 @@ class BinEditorFile : public Core::IFile
     Q_OBJECT
 public:
     BinEditorFile(BinEditor *parent) :
-        Core::IFile(parent),
-        m_mimeType(QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE))
+        Core::IFile(parent)
     {
         m_editor = parent;
         connect(m_editor, SIGNAL(dataRequested(Core::IEditor *, quint64, bool)),
@@ -194,7 +193,9 @@ public:
     }
     ~BinEditorFile() {}
 
-    virtual QString mimeType() const { return m_mimeType; }
+    QString mimeType() const {
+        return QLatin1String(Constants::C_BINEDITOR_MIMETYPE);
+    }
 
     bool save(const QString &fileName = QString()) {
         const QString fileNameToUse
@@ -261,19 +262,17 @@ public:
         m_fileName = filename;
     }
 
-    QString fileName() const {
-        return m_fileName;
-    }
+    QString fileName() const { return m_fileName; }
 
     QString defaultPath() const { return QString(); }
+
     QString suggestedFileName() const { return QString(); }
-    QString fileFilter() const { return QString(); }
-    QString fileExtension() const { return QString(); }
 
-    bool isModified() const {
-        return m_editor->isModified();
-    }
+    bool isModified() const { return m_editor->isModified(); }
+
     bool isReadOnly() const {
+        if (m_editor->editor()->property("MemoryView").toBool())
+            return false;
         const QFileInfo fi(m_fileName);
         return !fi.isWritable();
     }
@@ -304,7 +303,6 @@ public:
     }
 
 private:
-    const QString m_mimeType;
     BinEditor *m_editor;
     QString m_fileName;
 };
@@ -396,11 +394,10 @@ private:
 
 
 
-
 ///////////////////////////////// BinEditorFactory //////////////////////////////////
 
 BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) :
-    m_mimeTypes(QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE)),
+    m_mimeTypes(QLatin1String(Constants::C_BINEDITOR_MIMETYPE)),
     m_owner(owner)
 {
 }