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

CppEditor: Use class enum for CppUseSelectionsUpdater::CallType

Browse Source 
Change-Id: Iaf6df1ccec50b84048933506a46b93bedf77da8e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-09-15 15:25:27 +02:00
parent af3416a9de
commit d6da4e5136
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppeditorwidget.cpp
View File

@@ -774,7 +774,7 @@ QMenu *CppEditorWidget::createRefactorMenu(QWidget *parent) const
// updateSemanticInfo(m_semanticHighlighter->semanticInfo(currentSource())); // updateSemanticInfo(m_semanticHighlighter->semanticInfo(currentSource()));
if (isSemanticInfoValidExceptLocalUses()) { if (isSemanticInfoValidExceptLocalUses()) {
d->m_useSelectionsUpdater.update(CppUseSelectionsUpdater::Synchronous); d->m_useSelectionsUpdater.update(CppUseSelectionsUpdater::CallType::Synchronous);
addRefactoringActions(menu, createAssistInterface(QuickFix, ExplicitlyInvoked)); addRefactoringActions(menu, createAssistInterface(QuickFix, ExplicitlyInvoked));
} }
@@ -881,8 +881,8 @@ void CppEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo,
if (!d->m_localRenaming.isActive()) { if (!d->m_localRenaming.isActive()) {
const CppUseSelectionsUpdater::CallType type = updateUseSelectionSynchronously const CppUseSelectionsUpdater::CallType type = updateUseSelectionSynchronously
? CppUseSelectionsUpdater::Synchronous ? CppUseSelectionsUpdater::CallType::Synchronous
: CppUseSelectionsUpdater::Asynchronous; : CppUseSelectionsUpdater::CallType::Asynchronous;
d->m_useSelectionsUpdater.update(type); d->m_useSelectionsUpdater.update(type);
} }

2
src/plugins/cppeditor/cppuseselectionsupdater.cpp
View File

@@ -78,7 +78,7 @@ void CppUseSelectionsUpdater::update(CallType callType)
params.semanticInfo = cppEditorWidget->semanticInfo(); params.semanticInfo = cppEditorWidget->semanticInfo();
params.textCursor = TextEditor::Convenience::wordStartCursor(cppEditorWidget->textCursor()); params.textCursor = TextEditor::Convenience::wordStartCursor(cppEditorWidget->textCursor());
if (callType == Asynchronous) { if (callType == CallType::Asynchronous) {
if (isSameIdentifierAsBefore(params.textCursor)) if (isSameIdentifierAsBefore(params.textCursor))
return; return;

4
src/plugins/cppeditor/cppuseselectionsupdater.h
View File

@@ -49,8 +49,8 @@ public:
void scheduleUpdate(); void scheduleUpdate();
void abortSchedule(); void abortSchedule();
enum CallType { Synchronous, Asynchronous }; enum class CallType { Synchronous, Asynchronous };
void update(CallType callType = Asynchronous); void update(CallType callType = CallType::Asynchronous);
signals: signals:
void finished(CppTools::SemanticInfo::LocalUseMap localUses); void finished(CppTools::SemanticInfo::LocalUseMap localUses);