From d9e445bbe8d2d8649be0b8fb0496a874bc2b96f0 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 21 Jul 2010 09:42:33 +0200
Subject: [PATCH] debugger: re-enable snapshot creation using the menu action
---
src/plugins/debugger/debuggerconstants.h | 2 +-
src/plugins/debugger/debuggerengine.cpp | 4 ++--
src/plugins/debugger/debuggerengine.h | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 4 ++--
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
src/plugins/debugger/gdb/gdbengine.h | 2 +-
src/plugins/debugger/snapshothandler.cpp | 4 ++--
src/plugins/debugger/snapshotwindow.cpp | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 5b823e5243e..7f4b376f33e 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -250,7 +250,7 @@ enum ModelRoles
// Snapshots
SnapshotCapabilityRole,
- RequestMakeSnapshotRole,
+ RequestCreateSnapshotRole,
RequestActivateSnapshotRole,
RequestRemoveSnapshotRole,
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 9c0a64f8e48..50f4b801485 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -477,8 +477,8 @@ void DebuggerEngine::handleCommand(int role, const QVariant &value)
d->queueShutdownInferior();
break;
- case RequestMakeSnapshotRole:
- makeSnapshot();
+ case RequestCreateSnapshotRole:
+ createSnapshot();
break;
case RequestActivationRole:
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 6cd9fb8796c..e2b47831d83 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -152,7 +152,7 @@ public:
virtual bool isSynchroneous() const { return false; }
virtual QString qtNamespace() const { return QString(); }
- virtual void makeSnapshot() {}
+ virtual void createSnapshot() {}
virtual void updateAll() {}
virtual void attemptBreakpointSynchronization() {}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a2a1e833942..7d6b91db74e 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1177,8 +1177,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
m_actions.watchAction2 = new QAction(tr("Add to Watch Window"), this);
m_actions.watchAction2->setProperty(Role, RequestExecWatchRole);
- m_actions.snapshotAction = new QAction(tr("Snapshot"), this);
- m_actions.snapshotAction->setProperty(Role, RequestExecSnapshotRole);
+ m_actions.snapshotAction = new QAction(tr("Create Snapshot"), this);
+ m_actions.snapshotAction->setProperty(Role, RequestCreateSnapshotRole);
m_actions.snapshotAction->setIcon(
QIcon(":/debugger/images/debugger_snapshot_small.png"));
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1ad8e5f77e3..ff6df3110e7 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2968,7 +2968,7 @@ void GdbEngine::handleThreadListIds(const GdbResponse &response)
//
//////////////////////////////////////////////////////////////////////
-void GdbEngine::makeSnapshot()
+void GdbEngine::createSnapshot()
{
QString fileName;
QTemporaryFile tf(QDir::tempPath() + _("/gdbsnapshot"));
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index b2619c285a9..e4cdca9d540 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -378,7 +378,7 @@ private: ////////// View & Data Stuff //////////
//
// Snapshot specific stuff
//
- virtual void makeSnapshot();
+ virtual void createSnapshot();
void handleMakeSnapshot(const GdbResponse &response);
//
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index ff322b6484f..3a6fe2d7166 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -214,10 +214,10 @@ bool SnapshotHandler::setData
(const QModelIndex &index, const QVariant &value, int role)
{
Q_UNUSED(value);
- if (index.isValid() && role == RequestMakeSnapshotRole) {
+ if (index.isValid() && role == RequestCreateSnapshotRole) {
DebuggerEngine *engine = engineAt(index.row());
QTC_ASSERT(engine, return false);
- engine->makeSnapshot();
+ engine->createSnapshot();
return true;
}
if (index.isValid() && role == RequestActivateSnapshotRole) {
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index ad0ddf0be25..46b1a7d92a0 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -140,7 +140,7 @@ void SnapshotWindow::contextMenuEvent(QContextMenuEvent *ev)
QAction *act = menu.exec(ev->globalPos());
if (act == actCreate)
- model()->setData(idx, idx.row(), RequestMakeSnapshotRole);
+ model()->setData(idx, idx.row(), RequestCreateSnapshotRole);
else if (act == actRemove)
model()->setData(idx, idx.row(), RequestRemoveSnapshotRole);
else if (act == actAdjust)
--
GitLab