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

CodeAssist: Remove needless indirection in item access

Browse Source 
Change-Id: Ibcb6c4898b34ecab52de28485befdf589bb880d7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-09-13 02:05:06 +02:00
parent 866a99b655
commit 282864bdb9
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -1033,7 +1033,7 @@ void QmlJSAssistProposalModel::filter(const QString &prefix)
void QmlJSAssistProposalModel::sort(const QString &prefix) void QmlJSAssistProposalModel::sort(const QString &prefix)
{ {
std::sort(currentItems().first, currentItems().second, QmlJSLessThan(prefix)); std::sort(m_currentItems.begin(), m_currentItems.end(), QmlJSLessThan(prefix));
} }
bool QmlJSAssistProposalModel::keepPerfectMatch(AssistReason reason) const bool QmlJSAssistProposalModel::keepPerfectMatch(AssistReason reason) const

7
src/plugins/texteditor/codeassist/genericproposalmodel.cpp
View File

@@ -326,10 +326,3 @@ AssistProposalItem *GenericProposalModel::proposalItem(int index) const
{ {
return m_currentItems.at(index); return m_currentItems.at(index);
} }
QPair<QList<AssistProposalItem *>::iterator,
QList<AssistProposalItem *>::iterator>
GenericProposalModel::currentItems()
{
return qMakePair(m_currentItems.begin(), m_currentItems.end());
}

2
src/plugins/texteditor/codeassist/genericproposalmodel.h
View File

@@ -74,8 +74,6 @@ public:
bool isSortingAllowed() const; bool isSortingAllowed() const;
protected: protected:
typedef QList<AssistProposalItem *>::iterator ItemIterator;
QPair<ItemIterator, ItemIterator> currentItems();
QList<AssistProposalItem *> m_currentItems; QList<AssistProposalItem *> m_currentItems;
private: private: