Commit 4a3cc6d2 authored by Erik Verbruggen's avatar Erik Verbruggen

C++: set the objectName of QTimers.

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

Change-Id: Ib3aa8c1a1f50778bd89938d7c529d8399ccf91ea
Task-number: QTCREATORBUG-11262
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent ea82bfb5
......@@ -166,6 +166,7 @@ Parser::Parser(QObject *parent)
d(new ParserPrivate())
{
d->timer = new QTimer(this);
d->timer->setObjectName(QLatin1String("ClassViewParser::timer"));
d->timer->setSingleShot(true);
// connect signal/slots
......
......@@ -438,6 +438,7 @@ EditorManager::EditorManager(QWidget *parent) :
d->m_windowPopup = new OpenEditorsWindow(this);
d->m_autoSaveTimer = new QTimer(this);
d->m_autoSaveTimer->setObjectName(QLatin1String("EditorManager::m_autoSaveTimer"));
connect(d->m_autoSaveTimer, SIGNAL(timeout()), SLOT(autoSave()));
updateAutoSave();
}
......
......@@ -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()));
......
......@@ -82,9 +82,10 @@ private:
CPlusPlus::OverviewModel *m_sourceModel;
};
QTimer *newSingleShotTimer(QObject *parent, int msInternal)
QTimer *newSingleShotTimer(QObject *parent, int msInternal, const QString &objectName)
{
QTimer *timer = new QTimer(parent);
timer->setObjectName(objectName);
timer->setSingleShot(true);
timer->setInterval(msInternal);
return timer;
......@@ -131,10 +132,12 @@ CppEditorOutline::CppEditorOutline(CPPEditorWidget *editorWidget)
connect(m_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateToolTip()));
// Set up timers
m_updateTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs);
m_updateTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs,
QLatin1String("CppEditorOutline::m_updateTimer"));
connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateNow()));
m_updateIndexTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs);
m_updateIndexTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs,
QLatin1String("CppEditorOutline::m_updateIndexTimer"));
connect(m_updateIndexTimer, SIGNAL(timeout()), this, SLOT(updateIndexNow()));
}
......
......@@ -232,6 +232,7 @@ CppModelManager::CppModelManager(QObject *parent)
m_dirty = true;
m_delayedGcTimer = new QTimer(this);
m_delayedGcTimer->setObjectName(QLatin1String("CppModelManager::m_delayedGcTimer"));
m_delayedGcTimer->setSingleShot(true);
connect(m_delayedGcTimer, SIGNAL(timeout()), this, SLOT(GC()));
......
......@@ -137,11 +137,13 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor
}
m_updateDocumentTimer = new QTimer(this);
m_updateDocumentTimer->setObjectName(QLatin1String("CppEditorSupport::m_updateDocumentTimer"));
m_updateDocumentTimer->setSingleShot(true);
m_updateDocumentTimer->setInterval(m_updateDocumentInterval);
connect(m_updateDocumentTimer, SIGNAL(timeout()), this, SLOT(updateDocumentNow()));
m_updateEditorTimer = new QTimer(this);
m_updateEditorTimer->setObjectName(QLatin1String("CppEditorSupport::m_updateEditorTimer"));
m_updateEditorTimer->setInterval(UpdateEditorInterval);
m_updateEditorTimer->setSingleShot(true);
connect(m_updateEditorTimer, SIGNAL(timeout()),
......@@ -161,6 +163,7 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor
connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(onCurrentEditorChanged()));
m_editorGCTimer = new QTimer(this);
m_editorGCTimer->setObjectName(QLatin1String("CppEditorSupport::m_editorGCTimer"));
m_editorGCTimer->setSingleShot(true);
m_editorGCTimer->setInterval(EditorHiddenGCTimeout);
connect(m_editorGCTimer, SIGNAL(timeout()), this, SLOT(releaseResources()));
......
......@@ -47,6 +47,7 @@ StringTable::StringTable()
m_gcRunner.setAutoDelete(false);
m_gcCountDown.setObjectName(QLatin1String("StringTable::m_gcCountDown"));
m_gcCountDown.setSingleShot(true);
m_gcCountDown.setInterval(GCTimeOut);
connect(&m_gcCountDown, SIGNAL(timeout()),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment