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

debugger: fix manual reload of registers

Browse Source
This commit is contained in:
hjk
2009-10-02 16:55:03 +02:00
parent bbe3bab2e8
commit ebccd4c02a
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggermanager.h
View File

@@ -231,7 +231,7 @@ public slots:
public slots: // FIXME public slots: // FIXME
void showDebuggerOutput(const QString &msg) void showDebuggerOutput(const QString &msg)
{ showDebuggerOutput(LogDebug, msg); } { showDebuggerOutput(LogDebug, msg); }
private slots: //private slots: // FIXME
void showDebuggerOutput(int channel, const QString &msg); void showDebuggerOutput(int channel, const QString &msg);
void showDebuggerInput(int channel, const QString &msg); void showDebuggerInput(int channel, const QString &msg);
void showApplicationOutput(const QString &data); void showApplicationOutput(const QString &data);

22
src/plugins/debugger/registerwindow.cpp
View File

@@ -144,8 +144,7 @@ private:
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
RegisterWindow::RegisterWindow(DebuggerManager *manager) RegisterWindow::RegisterWindow(DebuggerManager *manager)
: m_manager(manager), m_alwaysResizeColumnsToContents(true), : m_manager(manager), m_alwaysResizeColumnsToContents(true)
m_alwaysReloadContents(false)
{ {
QAction *act = theDebuggerAction(UseAlternatingRowColors); QAction *act = theDebuggerAction(UseAlternatingRowColors);
setWindowTitle(tr("Registers")); setWindowTitle(tr("Registers"));
@@ -167,9 +166,6 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
QMenu menu; QMenu menu;
QAction *actReload = menu.addAction(tr("Reload register listing")); 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(); menu.addSeparator();
QModelIndex idx = indexAt(ev->pos()); QModelIndex idx = indexAt(ev->pos());
@@ -214,9 +210,7 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
else if (act == actAlwaysAdjust) else if (act == actAlwaysAdjust)
setAlwaysResizeColumnsToContents(!m_alwaysResizeColumnsToContents); setAlwaysResizeColumnsToContents(!m_alwaysResizeColumnsToContents);
else if (act == actReload) else if (act == actReload)
reloadContents(); m_manager->reloadRegisters();
else if (act == actAlwaysReload)
setAlwaysReloadContents(!m_alwaysReloadContents);
else if (act == actShowMemory) else if (act == actShowMemory)
(void) new MemoryViewAgent(m_manager, address); (void) new MemoryViewAgent(m_manager, address);
else if (act) { else if (act) {
@@ -240,18 +234,6 @@ void RegisterWindow::setAlwaysResizeColumnsToContents(bool on)
header()->setResizeMode(1, mode); 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) void RegisterWindow::setModel(QAbstractItemModel *model)
{ {

6
src/plugins/debugger/registerwindow.h
View File

@@ -44,14 +44,9 @@ public:
explicit RegisterWindow(DebuggerManager *manager); explicit RegisterWindow(DebuggerManager *manager);
void setModel(QAbstractItemModel *model); void setModel(QAbstractItemModel *model);
signals:
void reloadRegisterRequested();
public slots: public slots:
void resizeColumnsToContents(); void resizeColumnsToContents();
void setAlwaysResizeColumnsToContents(bool on); void setAlwaysResizeColumnsToContents(bool on);
void reloadContents();
void setAlwaysReloadContents(bool on);
void setAlternatingRowColorsHelper(bool on) { setAlternatingRowColors(on); } void setAlternatingRowColorsHelper(bool on) { setAlternatingRowColors(on); }
private: private:
@@ -61,7 +56,6 @@ private:
DebuggerManager *m_manager; DebuggerManager *m_manager;
bool m_alwaysResizeColumnsToContents; bool m_alwaysResizeColumnsToContents;
bool m_alwaysReloadContents;
}; };
} // namespace Internal } // namespace Internal