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

more Id type fixes

Browse Source 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-10 11:36:51 +01:00
committed by hjk
parent cfc9b71ecb
commit 82f5573626
102 changed files with 322 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -495,9 +495,9 @@ int CppFunctionHintModel::activeArgument(const QString &prefix) const
// ---------------------------
// CppCompletionAssistProvider
// ---------------------------
bool CppCompletionAssistProvider::supportsEditor(const QString &editorId) const
bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(CppEditor::Constants::CPPEDITOR_ID);
return editorId == Core::Id(CppEditor::Constants::CPPEDITOR_ID);
}
int CppCompletionAssistProvider::activationCharSequenceLength() const

2
src/plugins/cpptools/cppcompletionassist.h
View File

@@ -66,7 +66,7 @@ class CppAssistProposalModel;
class CppCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
public:
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual int activationCharSequenceLength() const;
virtual bool isActivationCharSequence(const QString &sequence) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;

2
src/plugins/cpptools/cppcurrentdocumentfilter.cpp
View File

@@ -113,7 +113,7 @@ void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
Core::Id(), Core::EditorManager::ModeSwitch);
}
void CppCurrentDocumentFilter::refresh(QFutureInterface<void> &future)

4
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -327,10 +327,10 @@ void CppFindReferences::openEditor(const Find::SearchResultItem &item)
{
if (item.path.size() > 0) {
TextEditor::BaseTextEditorWidget::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
QString(),
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(item.text, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(item.text, Core::Id(), Core::EditorManager::ModeSwitch);
}
}

2
src/plugins/cpptools/cpplocatorfilter.cpp
View File

@@ -131,7 +131,7 @@ void CppLocatorFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
Core::Id(), Core::EditorManager::ModeSwitch);
}
void CppLocatorFilter::reset()