Merge branch 'origin/2.0' (early part)

[qt-creator-jp/qt-creator-jp.git] / src / plugins / qmljseditor / qmljscodecompletion.h

diff --git a/src/plugins/qmljseditor/qmljscodecompletion.h b/src/plugins/qmljseditor/qmljscodecompletion.h
index 283b376..0cae652 100644 (file)
--- a/src/plugins/qmljseditor/qmljscodecompletion.h
+++ b/src/plugins/qmljseditor/qmljscodecompletion.h
@@ -40,6 +40,8 @@ class ITextEditable;
 }
 
 namespace QmlJS {
+    class ModelManagerInterface;
+
     namespace Interpreter {
         class Value;
     }
@@ -47,8 +49,6 @@ namespace QmlJS {
 
 namespace QmlJSEditor {
 
-class ModelManagerInterface;
-
 namespace Internal {
 
 class FunctionArgumentWidget;
@@ -58,7 +58,7 @@ class CodeCompletion: public TextEditor::ICompletionCollector
     Q_OBJECT
 
 public:
-    CodeCompletion(ModelManagerInterface *modelManager, QObject *parent = 0);
+    CodeCompletion(QmlJS::ModelManagerInterface *modelManager, QObject *parent = 0);
     virtual ~CodeCompletion();
 
     virtual TextEditor::ITextEditable *editor() const;
@@ -81,11 +81,14 @@ private:
     bool isDelimiter(QChar ch) const;
 
     void addCompletions(const QHash<QString, const QmlJS::Interpreter::Value *> &newCompletions,
-                        const QIcon &icon);
+                        const QIcon &icon, int relevance);
     void addCompletions(const QStringList &newCompletions,
-                        const QIcon &icon);
+                        const QIcon &icon, int relevance);
+    void addCompletionsPropertyLhs(
+            const QHash<QString, const QmlJS::Interpreter::Value *> &newCompletions,
+            const QIcon &icon, int relevance);
 
-    ModelManagerInterface *m_modelManager;
+    QmlJS::ModelManagerInterface *m_modelManager;
     TextEditor::ITextEditable *m_editor;
     int m_startPosition;
     QList<TextEditor::CompletionItem> m_completions;
@@ -93,6 +96,7 @@ private:
     QList<TextEditor::CompletionItem> m_snippets;
     QDateTime m_snippetFileLastModified;
     QPointer<FunctionArgumentWidget> m_functionArgumentWidget;
+    bool m_restartCompletion;
 };