diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h index 0cd0ca2aeb0398bf5ea9a22a5154931981b07ba0..8c588ddbea7f2e1c6a1a6e18159c049ed326b300 100644 --- a/src/plugins/debugger/debuggermanager.h +++ b/src/plugins/debugger/debuggermanager.h @@ -231,7 +231,7 @@ public slots: public slots: // FIXME void showDebuggerOutput(const QString &msg) { showDebuggerOutput(LogDebug, msg); } -private slots: +//private slots: // FIXME void showDebuggerOutput(int channel, const QString &msg); void showDebuggerInput(int channel, const QString &msg); void showApplicationOutput(const QString &data); diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp index 13c7a537c2aa289452c07835faf6b571e90a4734..3bc52f294567c15000ee3a3177948468bf8fac9c 100644 --- a/src/plugins/debugger/registerwindow.cpp +++ b/src/plugins/debugger/registerwindow.cpp @@ -144,8 +144,7 @@ private: /////////////////////////////////////////////////////////////////////// RegisterWindow::RegisterWindow(DebuggerManager *manager) - : m_manager(manager), m_alwaysResizeColumnsToContents(true), - m_alwaysReloadContents(false) + : m_manager(manager), m_alwaysResizeColumnsToContents(true) { QAction *act = theDebuggerAction(UseAlternatingRowColors); setWindowTitle(tr("Registers")); @@ -167,9 +166,6 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev) QMenu menu; QAction *actReload = menu.addAction(tr("Reload register listing")); - QAction *actAlwaysReload = menu.addAction(tr("Always reload register listing")); - actAlwaysReload->setCheckable(true); - actAlwaysReload->setChecked(m_alwaysReloadContents); menu.addSeparator(); QModelIndex idx = indexAt(ev->pos()); @@ -214,9 +210,7 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev) else if (act == actAlwaysAdjust) setAlwaysResizeColumnsToContents(!m_alwaysResizeColumnsToContents); else if (act == actReload) - reloadContents(); - else if (act == actAlwaysReload) - setAlwaysReloadContents(!m_alwaysReloadContents); + m_manager->reloadRegisters(); else if (act == actShowMemory) (void) new MemoryViewAgent(m_manager, address); else if (act) { @@ -240,18 +234,6 @@ void RegisterWindow::setAlwaysResizeColumnsToContents(bool on) header()->setResizeMode(1, mode); } -void RegisterWindow::setAlwaysReloadContents(bool on) -{ - m_alwaysReloadContents = on; - if (m_alwaysReloadContents) - reloadContents(); -} - -void RegisterWindow::reloadContents() -{ - emit reloadRegisterRequested(); -} - void RegisterWindow::setModel(QAbstractItemModel *model) { diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h index 394a1ca3c916078c816ea1b42cfdc8f110f2dbe4..3e7da419cf8166613f151377edce3f5b163b8eb8 100644 --- a/src/plugins/debugger/registerwindow.h +++ b/src/plugins/debugger/registerwindow.h @@ -44,14 +44,9 @@ public: explicit RegisterWindow(DebuggerManager *manager); void setModel(QAbstractItemModel *model); -signals: - void reloadRegisterRequested(); - public slots: void resizeColumnsToContents(); void setAlwaysResizeColumnsToContents(bool on); - void reloadContents(); - void setAlwaysReloadContents(bool on); void setAlternatingRowColorsHelper(bool on) { setAlternatingRowColors(on); } private: @@ -61,7 +56,6 @@ private: DebuggerManager *m_manager; bool m_alwaysResizeColumnsToContents; - bool m_alwaysReloadContents; }; } // namespace Internal