Commit 5cf1aaf6 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Fix compilation and initialization compile warnings.

Reviewed-by: Alessandro Portale
parent b87f0bfd
...@@ -680,8 +680,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) : ...@@ -680,8 +680,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
m_modelManager(0), m_modelManager(0),
m_contextPane(0), m_contextPane(0),
m_updateSelectedElements(false), m_updateSelectedElements(false),
m_findReferences(new FindReferences(this)), m_toolTipPosition(0),
m_toolTipPosition(0) m_findReferences(new FindReferences(this))
{ {
qRegisterMetaType<QmlJSEditor::Internal::SemanticInfo>("QmlJSEditor::Internal::SemanticInfo"); qRegisterMetaType<QmlJSEditor::Internal::SemanticInfo>("QmlJSEditor::Internal::SemanticInfo");
...@@ -728,10 +728,10 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) : ...@@ -728,10 +728,10 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
m_cursorPositionTimer->setSingleShot(true); m_cursorPositionTimer->setSingleShot(true);
connect(m_cursorPositionTimer, SIGNAL(timeout()), this, SLOT(updateCursorPositionNow())); connect(m_cursorPositionTimer, SIGNAL(timeout()), this, SLOT(updateCursorPositionNow()));
m_ToolTipTimer = new QTimer(this); m_toolTipTimer = new QTimer(this);
m_ToolTipTimer->setInterval(TOOLTIP_TIMER_INTERVAL); m_toolTipTimer->setInterval(TOOLTIP_TIMER_INTERVAL);
m_ToolTipTimer->setSingleShot(true); m_toolTipTimer->setSingleShot(true);
connect(m_ToolTipTimer, SIGNAL(timeout()), this, SLOT(updateToolTipNow())); connect(m_toolTipTimer, SIGNAL(timeout()), this, SLOT(updateToolTipNow()));
baseTextDocument()->setSyntaxHighlighter(new Highlighter(document())); baseTextDocument()->setSyntaxHighlighter(new Highlighter(document()));
...@@ -1473,7 +1473,7 @@ void QmlJSTextEditor::onTooltipRequested(TextEditor::ITextEditor* /* editor */, ...@@ -1473,7 +1473,7 @@ void QmlJSTextEditor::onTooltipRequested(TextEditor::ITextEditor* /* editor */,
{ {
m_toolTipPosition = position; m_toolTipPosition = position;
if (m_contextPane) { if (m_contextPane) {
m_ToolTipTimer->start(); m_toolTipTimer->start();
} }
} }
......
...@@ -318,8 +318,8 @@ private: ...@@ -318,8 +318,8 @@ private:
QTimer *m_semanticRehighlightTimer; QTimer *m_semanticRehighlightTimer;
QTimer *m_updateOutlineTimer; QTimer *m_updateOutlineTimer;
QTimer *m_updateOutlineIndexTimer; QTimer *m_updateOutlineIndexTimer;
QTimer *m_cursorPositionTimer;
QTimer *m_toolTipTimer; QTimer *m_toolTipTimer;
QTimer *m_cursorPositionTimer;
QComboBox *m_outlineCombo; QComboBox *m_outlineCombo;
QmlOutlineModel *m_outlineModel; QmlOutlineModel *m_outlineModel;
QModelIndex m_outlineModelIndex; QModelIndex m_outlineModelIndex;
......
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