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

TextEditor: Remove some TextEditor:: qualification

Browse Source 
Change-Id: I7e47ff13adefe70087207c4f59d6d19a55dcf9f8
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-03 08:56:24 +02:00
parent 57d9d86418
commit 23ea68306d
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ enum CompletionOrder {
TypeOrder = -30 TypeOrder = -30
}; };
static void addCompletion(QList<TextEditor::BasicProposalItem *> *completions, static void addCompletion(QList<BasicProposalItem *> *completions,
const QString &text, const QString &text,
const QIcon &icon, const QIcon &icon,
int order, int order,
@@ -100,7 +100,7 @@ static void addCompletion(QList<TextEditor::BasicProposalItem *> *completions,
completions->append(item); completions->append(item);
} }
static void addCompletions(QList<TextEditor::BasicProposalItem *> *completions, static void addCompletions(QList<BasicProposalItem *> *completions,
const QStringList &newCompletions, const QStringList &newCompletions,
const QIcon &icon, const QIcon &icon,
int order) int order)
@@ -125,10 +125,10 @@ public:
class CompletionAdder : public PropertyProcessor class CompletionAdder : public PropertyProcessor
{ {
protected: protected:
QList<TextEditor::BasicProposalItem *> *completions; QList<BasicProposalItem *> *completions;
public: public:
CompletionAdder(QList<TextEditor::BasicProposalItem *> *completions, CompletionAdder(QList<BasicProposalItem *> *completions,
const QIcon &icon, int order) const QIcon &icon, int order)
: completions(completions) : completions(completions)
, icon(icon) , icon(icon)
@@ -155,7 +155,7 @@ public:
class LhsCompletionAdder : public CompletionAdder class LhsCompletionAdder : public CompletionAdder
{ {
public: public:
LhsCompletionAdder(QList<TextEditor::BasicProposalItem *> *completions, LhsCompletionAdder(QList<BasicProposalItem *> *completions,
const QIcon &icon, const QIcon &icon,
int order, int order,
bool afterOn) bool afterOn)
@@ -353,7 +353,7 @@ bool QmlJSAssistProposalItem::prematurelyApplies(const QChar &c) const
|| (text().endsWith(QLatin1Char('.')) && c == QLatin1Char('.')); || (text().endsWith(QLatin1Char('.')) && c == QLatin1Char('.'));
} }
void QmlJSAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *editor, void QmlJSAssistProposalItem::applyContextualContent(BaseTextEditor *editor,
int basePosition) const int basePosition) const
{ {
const int currentPosition = editor->position(); const int currentPosition = editor->position();
@@ -392,7 +392,7 @@ void QmlJSAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor
// ------------------------- // -------------------------
// FunctionHintProposalModel // FunctionHintProposalModel
// ------------------------- // -------------------------
class FunctionHintProposalModel : public TextEditor::IFunctionHintProposalModel class FunctionHintProposalModel : public IFunctionHintProposalModel
{ {
public: public:
FunctionHintProposalModel(const QString &functionName, const QStringList &namedArguments, FunctionHintProposalModel(const QString &functionName, const QStringList &namedArguments,
@@ -968,7 +968,7 @@ bool QmlJSCompletionAssistProcessor::completeUrl(const QString &relativeBasePath
QmlJSCompletionAssistInterface::QmlJSCompletionAssistInterface(QTextDocument *textDocument, QmlJSCompletionAssistInterface::QmlJSCompletionAssistInterface(QTextDocument *textDocument,
int position, int position,
const QString &fileName, const QString &fileName,
TextEditor::AssistReason reason, AssistReason reason,
const SemanticInfo &info) const SemanticInfo &info)
: DefaultAssistInterface(textDocument, position, fileName, reason) : DefaultAssistInterface(textDocument, position, fileName, reason)
, m_semanticInfo(info) , m_semanticInfo(info)
@@ -1036,7 +1036,7 @@ void QmlJSAssistProposalModel::sort(const QString &prefix)
std::sort(currentItems().first, currentItems().second, QmlJSLessThan(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; return reason == ExplicitlyInvoked;
} }

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

@@ -37,14 +37,13 @@
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
using namespace TextEditor; namespace TextEditor {
// -------------------------- // --------------------------
// Keywords // Keywords
// -------------------------- // --------------------------
Keywords::Keywords() Keywords::Keywords()
{ {
} }
// Note: variables and functions must be sorted // Note: variables and functions must be sorted
@@ -99,7 +98,7 @@ bool KeywordsAssistProposalItem::prematurelyApplies(const QChar &c) const
return false; return false;
} }
void KeywordsAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *editor, void KeywordsAssistProposalItem::applyContextualContent(BaseTextEditor *editor,
int basePosition) const int basePosition) const
{ {
const CompletionSettings &settings = TextEditorSettings::completionSettings(); const CompletionSettings &settings = TextEditorSettings::completionSettings();
@@ -271,4 +270,4 @@ void KeywordsCompletionAssistProcessor::addWordsToProposalList(QList<BasicPropos
} }
} }
} // namespace TextEditor

13
src/plugins/texteditor/codeassist/keywordscompletionassist.h
View File

@@ -56,20 +56,19 @@ private:
QMap<QString, QStringList> m_functionArgs; QMap<QString, QStringList> m_functionArgs;
}; };
class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public TextEditor::BasicProposalItem class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public BasicProposalItem
{ {
public: public:
KeywordsAssistProposalItem(Keywords keywords); KeywordsAssistProposalItem(Keywords keywords);
~KeywordsAssistProposalItem(); ~KeywordsAssistProposalItem();
bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE; bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
void applyContextualContent(TextEditor::BaseTextEditor *editor, void applyContextualContent(BaseTextEditor *editor, int basePosition) const QTC_OVERRIDE;
int basePosition) const QTC_OVERRIDE;
private: private:
Keywords m_keywords; Keywords m_keywords;
}; };
class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public TextEditor::IFunctionHintProposalModel class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public IFunctionHintProposalModel
{ {
public: public:
KeywordsFunctionHintModel(const QStringList &functionSymbols); KeywordsFunctionHintModel(const QStringList &functionSymbols);
@@ -84,13 +83,13 @@ private:
QStringList m_functionSymbols; QStringList m_functionSymbols;
}; };
class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public TextEditor::IAssistProcessor class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public IAssistProcessor
{ {
public: public:
KeywordsCompletionAssistProcessor(Keywords keywords); KeywordsCompletionAssistProcessor(Keywords keywords);
~KeywordsCompletionAssistProcessor(); ~KeywordsCompletionAssistProcessor();
TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE; IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE;
QChar startOfCommentChar() const; QChar startOfCommentChar() const;
private: private:
@@ -101,7 +100,7 @@ private:
int m_startPosition; int m_startPosition;
QString m_word; QString m_word;
QScopedPointer<const TextEditor::IAssistInterface> m_interface; QScopedPointer<const IAssistInterface> m_interface;
const QIcon m_variableIcon; const QIcon m_variableIcon;
const QIcon m_functionIcon; const QIcon m_functionIcon;
Keywords m_keywords; Keywords m_keywords;