From 71007d2ccb135aad994102a72d74ee40c69de050 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 8 Nov 2010 15:57:40 +0100
Subject: [PATCH] debugger: less indirections when opening files

---
 src/plugins/debugger/debuggerengine.cpp    |  5 -----
 src/plugins/debugger/debuggerengine.h      |  1 -
 src/plugins/debugger/debuggerplugin.h      |  3 ++-
 src/plugins/debugger/moduleswindow.cpp     |  9 +++++++--
 src/plugins/debugger/sourcefileswindow.cpp | 16 +++++++---------
 src/plugins/debugger/sourcefileswindow.h   |  3 ---
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index daad800f3ba..a4ff424c1a2 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1168,11 +1168,6 @@ DebuggerPlugin *DebuggerEngine::plugin()
     return DebuggerPlugin::instance();
 }
 
-void DebuggerEngine::openFile(const QString &fileName, int lineNumber)
-{
-    plugin()->gotoLocation(fileName, lineNumber, false);
-}
-
 bool DebuggerEngine::isReverseDebugging() const
 {
     return plugin()->isReverseDebugging();
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index c8272000a24..badb9fea313 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -278,7 +278,6 @@ public:
     Q_SLOT void showStatusMessage(const QString &msg, int timeout = -1) const;
 
     void resetLocation();
-    void openFile(const QString &fileName, int lineNumber = -1);
     virtual void gotoLocation(const QString &fileName, int lineNumber, bool setMarker);
     virtual void gotoLocation(const Internal::StackFrame &frame, bool setMarker);
     virtual void quitDebugger(); // called by DebuggerRunControl
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 75f49f62d8b..d4ef3878150 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -101,7 +101,8 @@ public slots:
 
     // void runTest(const QString &fileName);
     void showMessage(const QString &msg, int channel, int timeout = -1);
-    void gotoLocation(const QString &fileName, int lineNumber, bool setMarker);
+    void gotoLocation(const QString &fileName, int lineNumber = -1,
+        bool setMarker = false);
 
 private:
     friend class DebuggerEngine;
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 39334634e86..8cff2955ffe 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -53,6 +53,11 @@
 namespace Debugger {
 namespace Internal {
 
+static DebuggerPlugin *plugin()
+{
+    return DebuggerPlugin::instance();
+}
+
 static DebuggerEngine *currentEngine()
 {
     return DebuggerPlugin::instance()->currentEngine();
@@ -77,7 +82,7 @@ ModulesWindow::ModulesWindow(QWidget *parent)
 
 void ModulesWindow::moduleActivated(const QModelIndex &index)
 {
-    currentEngine()->openFile(index.data().toString());
+    plugin()->gotoLocation(index.data().toString());
 }
 
 void ModulesWindow::resizeEvent(QResizeEvent *event)
@@ -186,7 +191,7 @@ void ModulesWindow::contextMenuEvent(QContextMenuEvent *ev)
     } else if (act == actLoadSymbolsForModule) {
         engine->loadSymbols(name);
     } else if (act == actEditFile) {
-        engine->openFile(name);
+        plugin()->gotoLocation(name);
     } else if (act == actShowSymbols) {
         // FIXME setModelData(RequestModuleSymbolsRole, name);
     }
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index b3f90d7d73f..0267ca89f39 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -54,6 +54,11 @@
 namespace Debugger {
 namespace Internal {
 
+static DebuggerPlugin *plugin()
+{
+    return DebuggerPlugin::instance();
+}
+
 static DebuggerEngine *currentEngine()
 {
     return DebuggerPlugin::instance()->currentEngine();
@@ -81,7 +86,7 @@ SourceFilesWindow::SourceFilesWindow(QWidget *parent)
 
 void SourceFilesWindow::sourceFileActivated(const QModelIndex &index)
 {
-    currentEngine()->openFile(index.data().toString());
+    plugin()->gotoLocation(index.data().toString());
 }
 
 void SourceFilesWindow::contextMenuEvent(QContextMenuEvent *ev)
@@ -115,14 +120,7 @@ void SourceFilesWindow::contextMenuEvent(QContextMenuEvent *ev)
     if (act == act1)
         currentEngine()->reloadSourceFiles();
     else if (act == act2)
-        currentEngine()->openFile(name);
-}
-
-void SourceFilesWindow::setModelData
-    (int role, const QVariant &value, const QModelIndex &index)
-{
-    QTC_ASSERT(model(), return);
-    model()->setData(index, value, role);
+        plugin()->gotoLocation(name);
 }
 
 } // namespace Internal
diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h
index 1dfeaf1b87d..9a5677e717c 100644
--- a/src/plugins/debugger/sourcefileswindow.h
+++ b/src/plugins/debugger/sourcefileswindow.h
@@ -30,7 +30,6 @@
 #ifndef DEBUGGER_SOURCEFILEWINDOW_H
 #define DEBUGGER_SOURCEFILEWINDOW_H
 
-
 #include <QtGui/QTreeView>
 
 namespace Debugger {
@@ -49,8 +48,6 @@ private slots:
 
 private:
     void contextMenuEvent(QContextMenuEvent *ev);
-    void setModelData(int role, const QVariant &value = QVariant(),
-        const QModelIndex &index = QModelIndex());
 };
 
 } // namespace Internal
-- 
GitLab