Debugger/Utils: Merge Debugger::TreeView into layer above and below

Change-Id: Ibb186cabba8fecedfdbd04da000459cf358e56e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

19 files changed, 47 insertions, 64 deletions

diff --git a/src/libs/utils/basetreeview.h b/src/libs/utils/basetreeview.h
index 592f510d13..31d57bc1f7 100644
--- a/src/libs/utils/basetreeview.h
+++ b/src/libs/utils/basetreeview.h
@@ -53,11 +53,10 @@ public:
     void mousePressEvent(QMouseEvent *ev);
 
 public slots:
-    void resizeColumns();
-    void resizeColumnsFinish();
     void reset();
 
-protected slots:
+    void resizeColumns();
+    void resizeColumnsFinish();
     void setAlternatingRowColorsHelper(bool on) { setAlternatingRowColors(on); }
     void setAlwaysAdjustColumns(bool on);
 
diff --git a/src/plugins/debugger/basewindow.cpp b/src/plugins/debugger/basewindow.cpp
index ed2bc0fb84..f80576e5e2 100644
--- a/src/plugins/debugger/basewindow.cpp
+++ b/src/plugins/debugger/basewindow.cpp
@@ -36,36 +36,28 @@
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/find/treeviewfind.h>
 #include <utils/savedaction.h>
+#include <utils/basetreeview.h>
 
-#include <QMenu>
 #include <QVBoxLayout>
 
 namespace Debugger {
 namespace Internal {
 
-BaseTreeView::BaseTreeView(QWidget *parent)
-    : Utils::BaseTreeView(parent)
+BaseWindow::BaseWindow(QTreeView *treeView, QWidget *parent)
+    : QWidget(parent), m_treeView(treeView)
 {
     QAction *act = debuggerCore()->action(UseAlternatingRowColors);
-    setAlternatingRowColors(act->isChecked());
+    m_treeView->setAlternatingRowColors(act->isChecked());
     connect(act, SIGNAL(toggled(bool)),
             SLOT(setAlternatingRowColorsHelper(bool)));
 
-    act = debuggerCore()->action(AlwaysAdjustColumnWidths);
-    setAlwaysAdjustColumns(act->isChecked());
-    connect(act, SIGNAL(toggled(bool)),
-            SLOT(setAlwaysAdjustColumns(bool)));
-}
-
-void BaseTreeView::addBaseContextActions(QMenu *menu)
-{
-    menu->addSeparator();
-    menu->addAction(debuggerCore()->action(SettingsDialog));
-}
+    if (Utils::BaseTreeView *tv = qobject_cast<Utils::BaseTreeView *>(m_treeView)) {
+        act = debuggerCore()->action(AlwaysAdjustColumnWidths);
+        tv->setAlwaysAdjustColumns(act->isChecked());
+        connect(act, SIGNAL(toggled(bool)),
+                SLOT(setAlwaysAdjustColumns(bool)));
+    }
 
-BaseWindow::BaseWindow(QTreeView *treeView, QWidget *parent)
-    : QWidget(parent), m_treeView(treeView)
-{
     QVBoxLayout *vbox = new QVBoxLayout(this);
     vbox->setMargin(0);
     vbox->setSpacing(0);
diff --git a/src/plugins/debugger/basewindow.h b/src/plugins/debugger/basewindow.h
index 53b0687b9d..3258a40dc6 100644
--- a/src/plugins/debugger/basewindow.h
+++ b/src/plugins/debugger/basewindow.h
@@ -30,20 +30,11 @@
 #ifndef DEBUGGER_BASEWINDOW_H
 #define DEBUGGER_BASEWINDOW_H
 
-#include <utils/basetreeview.h>
+#include <QTreeView>
 
 namespace Debugger {
 namespace Internal {
 
-class BaseTreeView : public Utils::BaseTreeView
-{
-    Q_OBJECT
-
-public:
-    explicit BaseTreeView(QWidget *parent = 0);
-    void addBaseContextActions(QMenu *menu);
-};
-
 class BaseWindow : public QWidget
 {
     Q_OBJECT
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 2a98e0f481..5a2925200d 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -832,7 +832,8 @@ void BreakTreeView::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(debuggerCore()->action(UseToolTipsInBreakpointsView));
     if (debuggerCore()->currentEngine()->hasCapability(MemoryAddressCapability))
         menu.addAction(debuggerCore()->action(UseAddressInBreakpointsView));
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
 
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h
index da74d0cb0c..9245bfcfee 100644
--- a/src/plugins/debugger/breakwindow.h
+++ b/src/plugins/debugger/breakwindow.h
@@ -32,11 +32,12 @@
 
 #include "breakpoint.h"
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class BreakTreeView : public BaseTreeView
+class BreakTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 176a2aa79f..6e3c5aac55 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -150,7 +150,8 @@ void ModulesTreeView::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(actEditFile);
     menu.addAction(actShowModuleSymbols);
     menu.addAction(actShowModuleSections);
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
 
diff --git a/src/plugins/debugger/moduleswindow.h b/src/plugins/debugger/moduleswindow.h
index ce6953e617..c651d14676 100644
--- a/src/plugins/debugger/moduleswindow.h
+++ b/src/plugins/debugger/moduleswindow.h
@@ -31,11 +31,12 @@
 #define DEBUGGER_MODULESWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class ModulesTreeView : public BaseTreeView
+class ModulesTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 071daaea75..478745ca2e 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -29,6 +29,7 @@
 
 #include "registerwindow.h"
 #include "memoryview.h"
+#include "debuggeractions.h"
 #include "debuggerdialogs.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
@@ -36,6 +37,7 @@
 #include "watchdelegatewidgets.h"
 #include "memoryagent.h"
 
+#include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
@@ -43,7 +45,6 @@
 #include <QItemDelegate>
 #include <QMenu>
 #include <QPainter>
-#include <QResizeEvent>
 
 
 namespace Debugger {
@@ -225,7 +226,8 @@ void RegisterTreeView::contextMenuEvent(QContextMenuEvent *ev)
     act2->setCheckable(true);
     act2->setChecked(base == 2);
 
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     const QPoint position = ev->globalPos();
     QAction *act = menu.exec(position);
diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h
index 68dce321c0..902fe9532d 100644
--- a/src/plugins/debugger/registerwindow.h
+++ b/src/plugins/debugger/registerwindow.h
@@ -31,11 +31,12 @@
 #define DEBUGGER_REGISTERWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class RegisterTreeView : public BaseTreeView
+class RegisterTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index 1ff9a6291e..86de243705 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -92,7 +92,8 @@ void SnapshotTreeView::contextMenuEvent(QContextMenuEvent *ev)
     QAction *actRemove = menu.addAction(tr("Remove Snapshot"));
     actRemove->setEnabled(idx.isValid());
 
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
 
diff --git a/src/plugins/debugger/snapshotwindow.h b/src/plugins/debugger/snapshotwindow.h
index 764ea9ea47..c8a5b28063 100644
--- a/src/plugins/debugger/snapshotwindow.h
+++ b/src/plugins/debugger/snapshotwindow.h
@@ -31,13 +31,14 @@
 #define DEBUGGER_SNAPSHOTWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
 class SnapshotHandler;
 
-class SnapshotTreeView : public BaseTreeView
+class SnapshotTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index 6113898fe3..6ddb7143e7 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -29,10 +29,12 @@
 
 #include "sourcefileswindow.h"
 
+#include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 
 #include <utils/qtcassert.h>
+#include <utils/savedaction.h>
 
 #include <QDebug>
 
@@ -87,7 +89,8 @@ void SourceFilesTreeView::contextMenuEvent(QContextMenuEvent *ev)
 
     menu.addAction(act1);
     menu.addAction(act2);
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
 
diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h
index 44b9d3d0bf..c1a82c5cc4 100644
--- a/src/plugins/debugger/sourcefileswindow.h
+++ b/src/plugins/debugger/sourcefileswindow.h
@@ -31,11 +31,12 @@
 #define SOURCEFILESWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class SourceFilesTreeView : public BaseTreeView
+class SourceFilesTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 3da7d9779d..83d0f26cee 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -204,17 +204,13 @@ void StackTreeView::contextMenuEvent(QContextMenuEvent *ev)
     if (engine->hasCapability(ShowModuleSymbolsCapability))
         actLoadSymbols = menu.addAction(tr("Try to Load Unknown Symbols"));
 
-#if 0 // @TODO: not implemented
-    menu.addAction(debuggerCore()->action(UseToolTipsInStackView));
-#endif
     if (engine->hasCapability(MemoryAddressCapability))
         menu.addAction(debuggerCore()->action(UseAddressInStackView));
 
     menu.addSeparator();
     menu.addAction(debuggerCore()->action(UseToolTipsInStackView));
     menu.addSeparator();
-
-    addBaseContextActions(&menu);
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
     if (!act)
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index 18c23d3ae3..137e872ccc 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -31,11 +31,12 @@
 #define DEBUGGER_STACKWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class StackTreeView : public BaseTreeView
+class StackTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 5aebb58131..570223ea82 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -53,21 +53,10 @@ void ThreadsTreeView::rowActivated(const QModelIndex &index)
     debuggerCore()->currentEngine()->selectThread(id);
 }
 
-void ThreadsTreeView::setModel(QAbstractItemModel *model)
-{
-    BaseTreeView::setModel(model);
-//    resizeColumnToContents(ThreadData::IdColumn);
-//    resizeColumnToContents(ThreadData::LineColumn);
-//    resizeColumnToContents(ThreadData::NameColumn);
-//    resizeColumnToContents(ThreadData::StateColumn);
-//    resizeColumnToContents(ThreadData::TargetIdColumn);
-//    resizeColumnToContents(ThreadData::DetailsColumn);
-}
-
 void ThreadsTreeView::contextMenuEvent(QContextMenuEvent *ev)
 {
     QMenu menu;
-    addBaseContextActions(&menu);
+    menu.addAction(debuggerCore()->action(SettingsDialog));
     menu.exec(ev->globalPos());
 }
 
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 8e2d2a2620..2f229acb26 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -31,11 +31,12 @@
 #define THREADSWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
 
-class ThreadsTreeView : public BaseTreeView
+class ThreadsTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT
 
@@ -44,7 +45,6 @@ public:
 
 private:
     void rowActivated(const QModelIndex &index);
-    void setModel(QAbstractItemModel *model);
     void contextMenuEvent(QContextMenuEvent *ev);
 };
 
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index c1aa3e078f..8e2559403c 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -912,7 +912,8 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(debuggerCore()->action(UseDynamicType));
     menu.addAction(debuggerCore()->action(SettingsDialog));
 
-    addBaseContextActions(&menu);
+    menu.addSeparator();
+    menu.addAction(debuggerCore()->action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
 
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 36e7b6d609..6210bf0e14 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -31,6 +31,7 @@
 #define DEBUGGER_WATCHWINDOW_H
 
 #include "basewindow.h"
+#include <utils/basetreeview.h>
 
 namespace Debugger {
 namespace Internal {
@@ -43,7 +44,7 @@ namespace Internal {
 
 enum WatchType { LocalsType, InspectType, WatchersType, ReturnType, TooltipType };
 
-class WatchTreeView : public BaseTreeView
+class WatchTreeView : public Utils::BaseTreeView
 {
     Q_OBJECT