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

C++: set the objectName of QTimers.

Browse Source 
This will hopefully help a bit in resolving the crashes that happen in
QCoreApplication::notifyInternal.

Change-Id: Ib3aa8c1a1f50778bd89938d7c529d8399ccf91ea
Task-number: QTCREATORBUG-11262
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-08-27 11:50:53 +02:00
parent ea82bfb532
commit 4a3cc6d2b2
7 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -93,9 +93,10 @@ using namespace CppEditor::Internal;
namespace {
QTimer *newSingleShotTimer(QObject *parent, int msecInterval)
QTimer *newSingleShotTimer(QObject *parent, int msecInterval, const QString &objectName)
{
QTimer *timer = new QTimer(parent);
timer->setObjectName(objectName);
timer->setSingleShot(true);
timer->setInterval(msecInterval);
return timer;
@@ -245,10 +246,13 @@ TextEditor::BaseTextEditor *CPPEditorWidget::createEditor()
void CPPEditorWidget::createToolBar(CPPEditor *editor)
{
d->m_updateUsesTimer = newSingleShotTimer(this, UPDATE_USES_INTERVAL);
d->m_updateUsesTimer = newSingleShotTimer(this, UPDATE_USES_INTERVAL,
QLatin1String("CPPEditorWidget::m_updateUsesTimer"));
connect(d->m_updateUsesTimer, SIGNAL(timeout()), this, SLOT(updateUsesNow()));
d->m_updateFunctionDeclDefLinkTimer = newSingleShotTimer(this, UPDATE_FUNCTION_DECL_DEF_LINK_INTERVAL);
d->m_updateFunctionDeclDefLinkTimer = newSingleShotTimer(
this, UPDATE_FUNCTION_DECL_DEF_LINK_INTERVAL,
QLatin1String("CPPEditorWidget::m_updateFunctionDeclDefLinkTimer"));
connect(d->m_updateFunctionDeclDefLinkTimer, SIGNAL(timeout()),
this, SLOT(updateFunctionDeclDefLinkNow()));