From 23ea68306df6f93a06fe1f7e30be952c8e1cc95b Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 3 Sep 2014 08:56:24 +0200 Subject: [PATCH] TextEditor: Remove some TextEditor:: qualification Change-Id: I7e47ff13adefe70087207c4f59d6d19a55dcf9f8 Reviewed-by: hjk --- .../qmljseditor/qmljscompletionassist.cpp | 18 +++++++++--------- .../codeassist/keywordscompletionassist.cpp | 7 +++---- .../codeassist/keywordscompletionassist.h | 13 ++++++------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index b0e01b8c014..65cac883124 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -83,7 +83,7 @@ enum CompletionOrder { TypeOrder = -30 }; -static void addCompletion(QList *completions, +static void addCompletion(QList *completions, const QString &text, const QIcon &icon, int order, @@ -100,7 +100,7 @@ static void addCompletion(QList *completions, completions->append(item); } -static void addCompletions(QList *completions, +static void addCompletions(QList *completions, const QStringList &newCompletions, const QIcon &icon, int order) @@ -125,10 +125,10 @@ public: class CompletionAdder : public PropertyProcessor { protected: - QList *completions; + QList *completions; public: - CompletionAdder(QList *completions, + CompletionAdder(QList *completions, const QIcon &icon, int order) : completions(completions) , icon(icon) @@ -155,7 +155,7 @@ public: class LhsCompletionAdder : public CompletionAdder { public: - LhsCompletionAdder(QList *completions, + LhsCompletionAdder(QList *completions, const QIcon &icon, int order, bool afterOn) @@ -353,7 +353,7 @@ bool QmlJSAssistProposalItem::prematurelyApplies(const QChar &c) const || (text().endsWith(QLatin1Char('.')) && c == QLatin1Char('.')); } -void QmlJSAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *editor, +void QmlJSAssistProposalItem::applyContextualContent(BaseTextEditor *editor, int basePosition) const { const int currentPosition = editor->position(); @@ -392,7 +392,7 @@ void QmlJSAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor // ------------------------- // FunctionHintProposalModel // ------------------------- -class FunctionHintProposalModel : public TextEditor::IFunctionHintProposalModel +class FunctionHintProposalModel : public IFunctionHintProposalModel { public: FunctionHintProposalModel(const QString &functionName, const QStringList &namedArguments, @@ -968,7 +968,7 @@ bool QmlJSCompletionAssistProcessor::completeUrl(const QString &relativeBasePath QmlJSCompletionAssistInterface::QmlJSCompletionAssistInterface(QTextDocument *textDocument, int position, const QString &fileName, - TextEditor::AssistReason reason, + AssistReason reason, const SemanticInfo &info) : DefaultAssistInterface(textDocument, position, fileName, reason) , m_semanticInfo(info) @@ -1036,7 +1036,7 @@ void QmlJSAssistProposalModel::sort(const QString &prefix) std::sort(currentItems().first, currentItems().second, QmlJSLessThan(prefix)); } -bool QmlJSAssistProposalModel::keepPerfectMatch(TextEditor::AssistReason reason) const +bool QmlJSAssistProposalModel::keepPerfectMatch(AssistReason reason) const { return reason == ExplicitlyInvoked; } diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index 961fd510311..61829a917c7 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -37,14 +37,13 @@ #include #include -using namespace TextEditor; +namespace TextEditor { // -------------------------- // Keywords // -------------------------- Keywords::Keywords() { - } // Note: variables and functions must be sorted @@ -99,7 +98,7 @@ bool KeywordsAssistProposalItem::prematurelyApplies(const QChar &c) const return false; } -void KeywordsAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *editor, +void KeywordsAssistProposalItem::applyContextualContent(BaseTextEditor *editor, int basePosition) const { const CompletionSettings &settings = TextEditorSettings::completionSettings(); @@ -271,4 +270,4 @@ void KeywordsCompletionAssistProcessor::addWordsToProposalList(QList m_functionArgs; }; -class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public TextEditor::BasicProposalItem +class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public BasicProposalItem { public: KeywordsAssistProposalItem(Keywords keywords); ~KeywordsAssistProposalItem(); bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE; - void applyContextualContent(TextEditor::BaseTextEditor *editor, - int basePosition) const QTC_OVERRIDE; + void applyContextualContent(BaseTextEditor *editor, int basePosition) const QTC_OVERRIDE; private: Keywords m_keywords; }; -class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public TextEditor::IFunctionHintProposalModel +class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public IFunctionHintProposalModel { public: KeywordsFunctionHintModel(const QStringList &functionSymbols); @@ -84,13 +83,13 @@ private: QStringList m_functionSymbols; }; -class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public TextEditor::IAssistProcessor +class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public IAssistProcessor { public: KeywordsCompletionAssistProcessor(Keywords keywords); ~KeywordsCompletionAssistProcessor(); - TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE; + IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE; QChar startOfCommentChar() const; private: @@ -101,7 +100,7 @@ private: int m_startPosition; QString m_word; - QScopedPointer m_interface; + QScopedPointer m_interface; const QIcon m_variableIcon; const QIcon m_functionIcon; Keywords m_keywords;