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

Debugger: Simplify LocalsAndExpressionsWindow implementation

Browse Source 
No need to keep some members

Change-Id: I24640654a4e1c9b529ee3847b48ee875b1083a12
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-02-20 16:33:56 +01:00
parent 30cb3be524
commit 373a29d580
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/debugger/localsandexpressionswindow.cpp
View File

@@ -43,28 +43,28 @@ LocalsAndExpressionsWindow::LocalsAndExpressionsWindow(QWidget *locals,
layout->setMargin(0); layout->setMargin(0);
layout->setSpacing(0); layout->setSpacing(0);
m_splitter = new Core::MiniSplitter(Qt::Vertical); auto splitter = new Core::MiniSplitter(Qt::Vertical);
layout->addWidget(m_splitter); layout->addWidget(splitter);
m_localsAndInspector = new QStackedWidget(); auto localsAndInspector = new QStackedWidget;
m_localsAndInspector->addWidget(locals); localsAndInspector->addWidget(locals);
m_localsAndInspector->addWidget(inspector); localsAndInspector->addWidget(inspector);
m_localsAndInspector->setCurrentWidget(inspector); localsAndInspector->setCurrentWidget(inspector);
m_splitter->addWidget(m_localsAndInspector); splitter->addWidget(localsAndInspector);
m_splitter->addWidget(returnWidget); splitter->addWidget(returnWidget);
m_splitter->addWidget(watchers); splitter->addWidget(watchers);
m_splitter->setStretchFactor(0, 3); splitter->setStretchFactor(0, 3);
m_splitter->setStretchFactor(2, 1); splitter->setStretchFactor(2, 1);
m_splitter->setStretchFactor(3, 1); splitter->setStretchFactor(3, 1);
// Timer is to prevent flicker when switching between Inpector and Locals // Timer is to prevent flicker when switching between Inpector and Locals
// when debugger engine changes states. // when debugger engine changes states.
m_timer.setSingleShot(true); m_timer.setSingleShot(true);
m_timer.setInterval(500); // TODO: remove the magic number! m_timer.setInterval(500); // TODO: remove the magic number!
connect(&m_timer, &QTimer::timeout, [this] { connect(&m_timer, &QTimer::timeout, [this, localsAndInspector] {
m_localsAndInspector->setCurrentIndex(m_showLocals ? LocalsIndex : InspectorIndex); localsAndInspector->setCurrentIndex(m_showLocals ? LocalsIndex : InspectorIndex);
}); });
} }

9
src/plugins/debugger/localsandexpressionswindow.h
View File

@@ -28,18 +28,11 @@
#include <QWidget> #include <QWidget>
#include <QTimer> #include <QTimer>
QT_BEGIN_NAMESPACE
class QSplitter;
class QStackedWidget;
QT_END_NAMESPACE
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
class LocalsAndExpressionsWindow : public QWidget class LocalsAndExpressionsWindow : public QWidget
{ {
Q_OBJECT
public: public:
LocalsAndExpressionsWindow(QWidget *locals, QWidget *inspector, LocalsAndExpressionsWindow(QWidget *locals, QWidget *inspector,
QWidget *returnWidget, QWidget *watchers); QWidget *returnWidget, QWidget *watchers);
@@ -47,8 +40,6 @@ public:
void setShowLocals(bool showLocals); void setShowLocals(bool showLocals);
private: private:
QSplitter *m_splitter;
QStackedWidget *m_localsAndInspector;
QTimer m_timer; QTimer m_timer;
bool m_showLocals; bool m_showLocals;
}; };