BinEditor/Debugger: Simplify signal and slot signatures

The IEditor parameter was never used.

Change-Id: Id374d9404701131d6c3ee02ed43fdbf3e3ed8af8
Reviewed-by: David Schulz <david.schulz@digia.com>

src/plugins/bineditor/bineditor.cpp

@@ -196,7 +196,7 @@ bool BinEditorWidget::requestDataAt(int pos) const
     if (!m_requests.contains(block)) {
         m_requests.insert(block);
         emit const_cast<BinEditorWidget*>(this)->
-            dataRequested(editor(), m_baseAddr / m_blockSize + block);
+            dataRequested(m_baseAddr / m_blockSize + block);
         return true;
     }
     return false;
@@ -230,7 +230,7 @@ void BinEditorWidget::changeDataAt(int pos, char c)
         }
     }
 
-    emit dataChanged(editor(), m_baseAddr + pos, QByteArray(1, c));
+    emit dataChanged(m_baseAddr + pos, QByteArray(1, c));
 }
 
 QByteArray BinEditorWidget::dataMid(int from, int length, bool old) const
@@ -442,9 +442,9 @@ void BinEditorWidget::scrollContentsBy(int dx, int dy)
     const QScrollBar * const scrollBar = verticalScrollBar();
     const int scrollPos = scrollBar->value();
     if (dy <= 0 && scrollPos == scrollBar->maximum())
-        emit newRangeRequested(editor(), baseAddress() + m_size);
+        emit newRangeRequested(baseAddress() + m_size);
     else if (dy >= 0 && scrollPos == scrollBar->minimum())
-        emit newRangeRequested(editor(), baseAddress());
+        emit newRangeRequested(baseAddress());
 }
 
 void BinEditorWidget::changeEvent(QEvent *e)
@@ -1058,7 +1058,7 @@ bool BinEditorWidget::event(QEvent *e)
             const QScrollBar * const scrollBar = verticalScrollBar();
             const int maximum = scrollBar->maximum();
             if (maximum && scrollBar->value() >= maximum - 1) {
-                emit newRangeRequested(editor(), baseAddress() + m_size);
+                emit newRangeRequested(baseAddress() + m_size);
                 return true;
             }
             break;
@@ -1571,7 +1571,7 @@ void BinEditorWidget::jumpToAddress(quint64 address)
     if (address >= m_baseAddr && address < m_baseAddr + m_size)
         setCursorPosition(address - m_baseAddr);
     else
-        emit newRangeRequested(editor(), address);
+        emit newRangeRequested(address);
 }
 
 void BinEditorWidget::setNewWindowRequestAllowed(bool c)

src/plugins/bineditor/bineditor.h

@@ -139,11 +139,11 @@ Q_SIGNALS:
     void redoAvailable(bool);
     void cursorPositionChanged(int position);
 
-    void dataRequested(Core::IEditor *editor, quint64 block);
+    void dataRequested(quint64 block);
     void newWindowRequested(quint64 address);
-    void newRangeRequested(Core::IEditor *, quint64 address);
+    void newRangeRequested(quint64 address);
     void addWatchpointRequested(quint64 address, uint size);
-    void dataChanged(Core::IEditor *, quint64 address, const QByteArray &data);
+    void dataChanged(quint64 address, const QByteArray &data);
 
 protected:
     void scrollContentsBy(int dx, int dy);

src/plugins/bineditor/bineditorplugin.cpp

@@ -184,10 +184,10 @@ public:
         Core::IDocument(parent)
     {
         m_widget = parent;
-        connect(m_widget, SIGNAL(dataRequested(Core::IEditor*,quint64)),
-            this, SLOT(provideData(Core::IEditor*,quint64)));
-        connect(m_widget, SIGNAL(newRangeRequested(Core::IEditor*,quint64)),
-            this, SLOT(provideNewRange(Core::IEditor*,quint64)));
+        connect(m_widget, SIGNAL(dataRequested(quint64)),
+            this, SLOT(provideData(quint64)));
+        connect(m_widget, SIGNAL(newRangeRequested(quint64)),
+            this, SLOT(provideNewRange(quint64)));
     }
     ~BinEditorDocument() {}
 
@@ -246,7 +246,8 @@ public:
     }
 
 private slots:
-    void provideData(Core::IEditor *, quint64 block) {
+    void provideData(quint64 block)
+    {
         if (m_fileName.isEmpty())
             return;
         QFile file(m_fileName);
@@ -266,7 +267,8 @@ private slots:
         }
     }
 
-    void provideNewRange(Core::IEditor *, quint64 offset) {
+    void provideNewRange(quint64 offset)
+    {
         open(0, m_fileName, offset);
     }
 

src/plugins/debugger/memoryagent.cpp

@@ -129,24 +129,12 @@ void MemoryAgent::updateMemoryView(quint64 address, quint64 length)
 
 void MemoryAgent::connectBinEditorWidget(QWidget *w)
 {
-    connect(w,
-        SIGNAL(dataRequested(Core::IEditor*,quint64)),
-        SLOT(fetchLazyData(Core::IEditor*,quint64)));
-    connect(w,
-        SIGNAL(newWindowRequested(quint64)),
-        SLOT(createBinEditor(quint64)));
-    connect(w,
-        SIGNAL(newRangeRequested(Core::IEditor*,quint64)),
-        SLOT(provideNewRange(Core::IEditor*,quint64)));
-    connect(w,
-        SIGNAL(dataChanged(Core::IEditor*,quint64,QByteArray)),
-        SLOT(handleDataChanged(Core::IEditor*,quint64,QByteArray)));
-    connect(w,
-        SIGNAL(dataChanged(Core::IEditor*,quint64,QByteArray)),
-        SLOT(handleDataChanged(Core::IEditor*,quint64,QByteArray)));
-    connect(w,
-        SIGNAL(addWatchpointRequested(quint64,uint)),
-        SLOT(handleWatchpointRequest(quint64,uint)));
+    connect(w, SIGNAL(dataRequested(quint64)), SLOT(fetchLazyData(quint64)));
+    connect(w, SIGNAL(newWindowRequested(quint64)), SLOT(createBinEditor(quint64)));
+    connect(w, SIGNAL(newRangeRequested(quint64)), SLOT(provideNewRange(quint64)));
+    connect(w, SIGNAL(dataChanged(quint64,QByteArray)), SLOT(handleDataChanged(quint64,QByteArray)));
+    connect(w, SIGNAL(dataChanged(quint64,QByteArray)), SLOT(handleDataChanged(quint64,QByteArray)));
+    connect(w, SIGNAL(addWatchpointRequested(quint64,uint)), SLOT(handleWatchpointRequest(quint64,uint)));
 }
 
 bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags,
@@ -222,7 +210,7 @@ void MemoryAgent::createBinEditor(quint64 addr)
     createBinEditor(addr, 0, QList<MemoryMarkup>(), QPoint(), QString(), 0);
 }
 
-void MemoryAgent::fetchLazyData(IEditor *, quint64 block)
+void MemoryAgent::fetchLazyData(quint64 block)
 {
     m_engine->fetchMemory(this, sender(), BinBlockSize * block, BinBlockSize);
 }
@@ -235,15 +223,14 @@ void MemoryAgent::addLazyData(QObject *editorToken, quint64 addr,
     MemoryView::binEditorAddData(w, addr, ba);
 }
 
-void MemoryAgent::provideNewRange(IEditor *, quint64 address)
+void MemoryAgent::provideNewRange(quint64 address)
 {
     QWidget *w = qobject_cast<QWidget *>(sender());
     QTC_ASSERT(w, return);
     MemoryView::setBinEditorRange(w, address, DataRange, BinBlockSize);
 }
 
-void MemoryAgent::handleDataChanged(IEditor *,
-    quint64 addr, const QByteArray &data)
+void MemoryAgent::handleDataChanged(quint64 addr, const QByteArray &data)
 {
     m_engine->changeMemory(this, sender(), addr, data);
 }

src/plugins/debugger/memoryagent.h

@@ -95,10 +95,9 @@ public slots:
     void closeViews();
 
 private slots:
-    void fetchLazyData(Core::IEditor *, quint64 block);
-    void provideNewRange(Core::IEditor *editor, quint64 address);
-    void handleDataChanged(Core::IEditor *editor, quint64 address,
-        const QByteArray &data);
+    void fetchLazyData(quint64 block);
+    void provideNewRange(quint64 address);
+    void handleDataChanged(quint64 address, const QByteArray &data);
     void handleWatchpointRequest(quint64 address, uint size);
     void updateMemoryView(quint64 address, quint64 length);
     void engineStateChanged(Debugger::DebuggerState s);