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

TextEditor: Replace in-class connection by virtual function

Browse Source 
Change-Id: Ifb51606f71100223631d086318c230a478d70712
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-20 21:40:21 +02:00
parent 2cf2dadffb
commit cc351381ae
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,9 +199,6 @@ CppEditorWidget::CppEditorWidget(TextEditor::BaseTextDocumentPtr doc)
this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult>*,uint))); this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult>*,uint)));
} }
connect(this, SIGNAL(refactorMarkerClicked(TextEditor::RefactorMarker)),
this, SLOT(onRefactorMarkerClicked(TextEditor::RefactorMarker)));
connect(d->m_declDefLinkFinder, SIGNAL(foundLink(QSharedPointer<FunctionDeclDefLink>)), connect(d->m_declDefLinkFinder, SIGNAL(foundLink(QSharedPointer<FunctionDeclDefLink>)),
this, SLOT(onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefLink>))); this, SLOT(onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefLink>)));

3
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -156,9 +156,6 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(BaseTextDocumentPtr doc)
connect(m_qmlJsEditorDocument, SIGNAL(semanticInfoUpdated(QmlJSTools::SemanticInfo)), connect(m_qmlJsEditorDocument, SIGNAL(semanticInfoUpdated(QmlJSTools::SemanticInfo)),
this, SLOT(semanticInfoUpdated(QmlJSTools::SemanticInfo))); this, SLOT(semanticInfoUpdated(QmlJSTools::SemanticInfo)));
connect(this, SIGNAL(refactorMarkerClicked(TextEditor::RefactorMarker)),
SLOT(onRefactorMarkerClicked(TextEditor::RefactorMarker)));
setRequestMarkEnabled(true); setRequestMarkEnabled(true);
createToolBar(); createToolBar();
} }

2
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -4767,7 +4767,7 @@ void BaseTextEditorWidget::mousePressEvent(QMouseEvent *e)
RefactorMarker refactorMarker = d->m_refactorOverlay->markerAt(e->pos()); RefactorMarker refactorMarker = d->m_refactorOverlay->markerAt(e->pos());
if (refactorMarker.isValid()) { if (refactorMarker.isValid()) {
emit refactorMarkerClicked(refactorMarker); onRefactorMarkerClicked(refactorMarker);
} else { } else {
d->updateLink(e); d->updateLink(e);

3
src/plugins/texteditor/basetexteditor.h
View File

@@ -490,7 +490,6 @@ public slots:
signals: signals:
void assistFinished(); void assistFinished();
void readOnlyChanged(); void readOnlyChanged();
void refactorMarkerClicked(const TextEditor::RefactorMarker &marker);
void requestFontZoom(int zoom); void requestFontZoom(int zoom);
void requestZoomReset(); void requestZoomReset();
@@ -536,6 +535,8 @@ protected:
virtual void triggerPendingUpdates(); virtual void triggerPendingUpdates();
virtual void applyFontSettings(); virtual void applyFontSettings();
virtual void onRefactorMarkerClicked(const RefactorMarker &) {}
void showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId); void showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId);
public: public: