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

QmlProfiler: Make use of QSharedPointer for TracePlugin

Browse Source 
THe plugin might be deleted when the client is deleted.
This commit is contained in:
Kai Koehne
2011-04-14 17:18:32 +02:00
parent 35493c454c
commit 5fee646b5b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmlprofiler/tracewindow.cpp
View File

@@ -267,8 +267,7 @@ void TracePlugin::messageReceived(const QByteArray &data)
} }
TraceWindow::TraceWindow(QWidget *parent) TraceWindow::TraceWindow(QWidget *parent)
: QWidget(parent), : QWidget(parent)
m_plugin(0)
{ {
setObjectName(tr("Qml Performance Monitor")); setObjectName(tr("Qml Performance Monitor"));
@@ -295,19 +294,20 @@ TraceWindow::TraceWindow(QWidget *parent)
TraceWindow::~TraceWindow() TraceWindow::~TraceWindow()
{ {
delete m_plugin; delete m_plugin.data();
} }
void TraceWindow::reset(QDeclarativeDebugConnection *conn) void TraceWindow::reset(QDeclarativeDebugConnection *conn)
{ {
if (m_plugin) if (m_plugin)
disconnect(m_plugin,SIGNAL(complete()), this, SIGNAL(viewUpdated())); disconnect(m_plugin.data(), SIGNAL(complete()), this, SIGNAL(viewUpdated()));
delete m_plugin; delete m_plugin.data();
m_plugin = new TracePlugin(conn); m_plugin = new TracePlugin(conn);
connect(m_plugin,SIGNAL(complete()), this, SIGNAL(viewUpdated())); connect(m_plugin.data(), SIGNAL(complete()), this, SIGNAL(viewUpdated()));
connect(m_plugin,SIGNAL(range(int,qint64,qint64,QStringList,QString,int)),this,SIGNAL(range(int,qint64,qint64,QStringList,QString,int))); connect(m_plugin.data(), SIGNAL(range(int,qint64,qint64,QStringList,QString,int)),
this, SIGNAL(range(int,qint64,qint64,QStringList,QString,int)));
m_view->rootContext()->setContextProperty("connection", m_plugin); m_view->rootContext()->setContextProperty("connection", m_plugin.data());
m_view->setSource(QUrl("qrc:/qmlprofiler/MainView.qml")); m_view->setSource(QUrl("qrc:/qmlprofiler/MainView.qml"));
connect(m_view->rootObject(), SIGNAL(updateCursorPosition()), this, SLOT(updateCursorPosition())); connect(m_view->rootObject(), SIGNAL(updateCursorPosition()), this, SLOT(updateCursorPosition()));
@@ -328,17 +328,17 @@ void TraceWindow::updateTimer()
void TraceWindow::clearDisplay() void TraceWindow::clearDisplay()
{ {
if (m_plugin) if (m_plugin)
m_plugin->clearView(); m_plugin.data()->clearView();
} }
void TraceWindow::setRecording(bool recording) void TraceWindow::setRecording(bool recording)
{ {
m_plugin->setRecording(recording); m_plugin.data()->setRecording(recording);
} }
bool TraceWindow::isRecording() const bool TraceWindow::isRecording() const
{ {
return (m_plugin->recording()); return (m_plugin.data()->recording());
} }
#include "tracewindow.moc" #include "tracewindow.moc"

2
src/plugins/qmlprofiler/tracewindow.h
View File

@@ -81,7 +81,7 @@ signals:
void range(int type, qint64 startTime, qint64 length, const QStringList &data, const QString &fileName, int line); void range(int type, qint64 startTime, qint64 length, const QStringList &data, const QString &fileName, int line);
private: private:
TracePlugin *m_plugin; QWeakPointer<TracePlugin> m_plugin;
QSize m_sizeHint; QSize m_sizeHint;
QDeclarativeView *m_view; QDeclarativeView *m_view;