Debugger: Rename LocalsAndWatchersWindow

Rename LocalsAndWatchersWindow to LocalsAndExpressionsWindow.

Change-Id: Ifc73ce0e9ec831bc93594b5a600f82d33845b2f7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

src/plugins/debugger/debugger.pro

@@ -73,7 +73,7 @@ HEADERS += \
     qtmessagelogproxymodel.h \
     qtmessagelogitemdelegate.h \
     qtmessageloghandler.h \
-    localsandwatcherswindow.h
+    localsandexpressionswindow.h
 
 SOURCES += \
     basewindow.cpp \
@@ -125,7 +125,7 @@ SOURCES += \
     qtmessagelogitemdelegate.cpp \
     qtmessageloghandler.cpp \
     qtmessagelogeditor.cpp \
-    localsandwatcherswindow.cpp
+    localsandexpressionswindow.cpp
 
 FORMS += attachexternaldialog.ui \
     attachcoredialog.ui \

src/plugins/debugger/debugger.qbs

@@ -76,8 +76,8 @@ QtcPlugin {
         "disassemblerlines.cpp",
         "disassemblerlines.h",
         "localsandexpressionsoptionspage.ui",
-        "localsandwatcherswindow.cpp",
-        "localsandwatcherswindow.h",
+        "localsandexpressionswindow.cpp",
+        "localsandexpressionswindow.h",
         "logwindow.cpp",
         "logwindow.h",
         "memoryagent.cpp",

src/plugins/debugger/debuggerplugin.cpp

@@ -62,7 +62,7 @@
 #include "watchwindow.h"
 #include "watchutils.h"
 #include "debuggertooltipmanager.h"
-#include "localsandwatcherswindow.h"
+#include "localsandexpressionswindow.h"
 
 #include "snapshothandler.h"
 #include "threadshandler.h"
@@ -1183,7 +1183,7 @@ public:
     BaseWindow *m_stackWindow;
     BaseWindow *m_threadsWindow;
     LogWindow *m_logWindow;
-    LocalsAndWatchersWindow *m_localsAndWatchersWindow;
+    LocalsAndExpressionsWindow *m_localsAndExpressionsWindow;
 
     bool m_busy;
     QString m_lastPermanentStatusMessage;
@@ -1238,7 +1238,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) :
     m_stackWindow = 0;
     m_threadsWindow = 0;
     m_logWindow = 0;
-    m_localsAndWatchersWindow = 0;
+    m_localsAndExpressionsWindow = 0;
     m_qtMessageLogWindow = 0;
 
     m_mainWindow = 0;
@@ -2309,7 +2309,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
         m_debugWithoutDeployAction->setEnabled(false);
         m_visibleStartAction->setAction(m_continueAction);
         m_hiddenStopAction->setAction(m_exitAction);
-        m_localsAndWatchersWindow->setShowLocals(true);
+        m_localsAndExpressionsWindow->setShowLocals(true);
     } else if (state == InferiorRunOk) {
         // Shift-F5 interrupts. It is also "interruptible".
         m_interruptAction->setEnabled(true);
@@ -2319,7 +2319,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
         m_debugWithoutDeployAction->setEnabled(false);
         m_visibleStartAction->setAction(m_interruptAction);
         m_hiddenStopAction->setAction(m_interruptAction);
-        m_localsAndWatchersWindow->setShowLocals(false);
+        m_localsAndExpressionsWindow->setShowLocals(false);
     } else if (state == DebuggerFinished) {
         // We don't want to do anything anymore.
         m_interruptAction->setEnabled(false);
@@ -2342,7 +2342,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
         m_visibleStartAction->setAction(m_undisturbableAction);
         m_hiddenStopAction->setAction(m_exitAction);
         // show locals in core dumps
-        m_localsAndWatchersWindow->setShowLocals(true);
+        m_localsAndExpressionsWindow->setShowLocals(true);
     } else {
         // Everything else is "undisturbable".
         m_interruptAction->setEnabled(false);
@@ -3061,13 +3061,13 @@ void DebuggerPluginPrivate::extensionsInitialized()
     m_mainWindow->createDockWidget(CppLanguage, m_stackWindow);
     m_mainWindow->createDockWidget(CppLanguage, m_threadsWindow);
 
-    m_localsAndWatchersWindow = new LocalsAndWatchersWindow(
+    m_localsAndExpressionsWindow = new LocalsAndExpressionsWindow(
                 m_localsWindow, m_inspectorWindow, m_returnWindow,
                 m_watchersWindow);
-    m_localsAndWatchersWindow->setObjectName(QLatin1String(DOCKWIDGET_WATCHERS));
-    m_localsAndWatchersWindow->setWindowTitle(m_localsWindow->windowTitle());
+    m_localsAndExpressionsWindow->setObjectName(QLatin1String(DOCKWIDGET_WATCHERS));
+    m_localsAndExpressionsWindow->setWindowTitle(m_localsWindow->windowTitle());
 
-    dock = m_mainWindow->createDockWidget(CppLanguage, m_localsAndWatchersWindow);
+    dock = m_mainWindow->createDockWidget(CppLanguage, m_localsAndExpressionsWindow);
     dock->setProperty(DOCKWIDGET_DEFAULT_AREA, Qt::RightDockWidgetArea);
 
     m_mainWindow->addStagedMenuEntries();

src/plugins/debugger/localsandwatcherswindow.cpp → src/plugins/debugger/localsandexpressionswindow.cpp

-#include "localsandwatcherswindow.h"
+#include "localsandexpressionswindow.h"
 #include <QVBoxLayout>
 #include <QSplitter>
 #include <QStackedWidget>
@@ -6,7 +6,7 @@
 namespace Debugger {
 namespace Internal {
 
-LocalsAndWatchersWindow::LocalsAndWatchersWindow(
+LocalsAndExpressionsWindow::LocalsAndExpressionsWindow(
         QWidget *locals, QWidget *inspector, QWidget *returnWidget,
         QWidget *watchers, QWidget *parent)
     : QWidget(parent)
@@ -32,7 +32,7 @@ LocalsAndWatchersWindow::LocalsAndWatchersWindow(
     m_splitter->setStretchFactor(3, 1);
 }
 
-void LocalsAndWatchersWindow::setShowLocals(bool showLocals)
+void LocalsAndExpressionsWindow::setShowLocals(bool showLocals)
 {
     m_localsAndInspector->setCurrentIndex(showLocals ? 0 : 1);
 }

src/plugins/debugger/localsandwatcherswindow.h → src/plugins/debugger/localsandexpressionswindow.h

-#ifndef LOCALSANDWATCHERSWIDGET_H
-#define LOCALSANDWATCHERSWIDGET_H
+#ifndef LOCALSANDEXPRESSIONSWINDOW_H
+#define LOCALSANDEXPRESSIONSWINDOW_H
 
 #include <QWidget>
 
@@ -11,11 +11,11 @@ QT_END_NAMESPACE
 namespace Debugger {
 namespace Internal {
 
-class LocalsAndWatchersWindow : public QWidget
+class LocalsAndExpressionsWindow : public QWidget
 {
     Q_OBJECT
 public:
-    explicit LocalsAndWatchersWindow(
+    explicit LocalsAndExpressionsWindow(
             QWidget *locals, QWidget *inspector,
             QWidget *returnWidget, QWidget *watchers, QWidget *parent = 0);
 
@@ -29,4 +29,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // LOCALSANDWATCHERSWIDGET_H
+#endif // LOCALSANDEXPRESSIONSWINDOW_H