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

Debugger: Rename LocalsAndWatchersWindow

Browse Source 
Rename LocalsAndWatchersWindow to LocalsAndExpressionsWindow.

Change-Id: Ifc73ce0e9ec831bc93594b5a600f82d33845b2f7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Kai Koehne
2012-05-14 16:09:12 +02:00
parent e597097a60
commit 871c75a223
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debugger.pro
View File

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

4
src/plugins/debugger/debugger.qbs
View File

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

20
src/plugins/debugger/debuggerplugin.cpp
View File

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

6
src/plugins/debugger/localsandwatcherswindow.cpp → src/plugins/debugger/localsandexpressionswindow.cpp
View File

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

10
src/plugins/debugger/localsandwatcherswindow.h → src/plugins/debugger/localsandexpressionswindow.h
View File

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