diff options
author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-01-22 18:38:45 +0100 |
---|---|---|
committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-01-28 15:01:00 +0100 |
commit | a8ea0a07366123ccf50dbb78a2c317567a26bc2b (patch) | |
tree | d1c5d549d48b5b1d0db364de94a9d23f7ec643c4 /src/plugins/qmljstools/qmljsrefactoringchanges.cpp | |
parent | a8e8c5fe1d2a3fdee02ad4f05f43bcccfbc3f09d (diff) | |
download | qt-creator-a8ea0a07366123ccf50dbb78a2c317567a26bc2b.tar.gz |
qmljs: generalize language treatement
* better support qbs and similar non QtQuick qml languages
* begin to clean and migrate things from ModelManager to
ModelManagerInterface
Change-Id: Ifa39dc1e4c568e9e21307f4913dcb5989e80420f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljsrefactoringchanges.cpp')
-rw-r--r-- | src/plugins/qmljstools/qmljsrefactoringchanges.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp index 7467087bc0..f5a73ef060 100644 --- a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp +++ b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp @@ -124,7 +124,7 @@ QmlJSRefactoringFile::QmlJSRefactoringFile(const QString &fileName, const QShare : RefactoringFile(fileName, data) { // the RefactoringFile is invalid if its not for a file with qml or js code - if (languageOfFile(fileName) == Language::Unknown) + if (ModelManagerInterface::guessLanguageOfFile(fileName) == Language::Unknown) m_fileName.clear(); } @@ -142,7 +142,8 @@ Document::Ptr QmlJSRefactoringFile::qmljsDocument() const const QString name = fileName(); const Snapshot &snapshot = data()->m_snapshot; - Document::MutablePtr newDoc = snapshot.documentFromSource(source, name, languageOfFile(name)); + Document::MutablePtr newDoc = snapshot.documentFromSource(source, name, + ModelManagerInterface::guessLanguageOfFile(name)); newDoc->parse(); m_qmljsDocument = newDoc; } |