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

TextEditor: Merge some "assist" related classes

Browse Source 
Simplifies the code base by removing one level of unused
and unneeded abstraction.

- Merge {I,Default}AssistInterface to AssistInterface
- Merge {IAssist,Basic}ProposalItem to AssistProposalItem
- Merge {IGenericProposal,BasicProposalItemList}Model to GenericProposalModel

Change-Id: I54ee7b095427383d67a00fc1d87c3808c21d812d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-09-04 00:04:18 +02:00
parent 0c3eeab464
commit 0edefc4c2b
60 changed files with 464 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
View File

@@ -29,9 +29,9 @@
#include "quickfixassistprocessor.h"
#include "quickfixassistprovider.h"
#include "iassistinterface.h"
#include "basicproposalitemlistmodel.h"
#include "basicproposalitem.h"
#include "assistinterface.h"
#include "genericproposalmodel.h"
#include "assistproposalitem.h"
#include "genericproposal.h"
// @TODO: Move...
@@ -39,7 +39,7 @@
#include <QDebug>
using namespace TextEditor;
namespace TextEditor {
QuickFixAssistProcessor::QuickFixAssistProcessor()
{}
@@ -47,12 +47,12 @@ QuickFixAssistProcessor::QuickFixAssistProcessor()
QuickFixAssistProcessor::~QuickFixAssistProcessor()
{}
IAssistProposal *QuickFixAssistProcessor::perform(const IAssistInterface *interface)
IAssistProposal *QuickFixAssistProcessor::perform(const AssistInterface *interface)
{
if (!interface)
return 0;
QSharedPointer<const IAssistInterface> assistInterface(interface);
QSharedPointer<const AssistInterface> assistInterface(interface);
QuickFixOperations quickFixes;
@@ -62,18 +62,20 @@ IAssistProposal *QuickFixAssistProcessor::perform(const IAssistInterface *interf
factory->matchingOperations(assistInterface, quickFixes);
if (!quickFixes.isEmpty()) {
QList<BasicProposalItem *> items;
QList<AssistProposalItem *> items;
foreach (const QuickFixOperation::Ptr &op, quickFixes) {
QVariant v;
v.setValue(op);
BasicProposalItem *item = new BasicProposalItem;
AssistProposalItem *item = new AssistProposalItem;
item->setText(op->description());
item->setData(v);
item->setOrder(op->priority());
items.append(item);
}
return new GenericProposal(interface->position(), new BasicProposalItemListModel(items));
return new GenericProposal(interface->position(), new GenericProposalModel(items));
}
return 0;
}
} // namespace TextEdit