diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-10-16 14:59:28 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-10-23 00:35:16 +0200 |
| commit | 0a4310d3148861062b9679e1415197b3a883164f (patch) | |
| tree | bdc93dcc43e1ada315aca79883e1e890327d5faa /src/libs/qmljs/qmljsbundle.cpp | |
| parent | ab71755326eeee537fb9eee157d7fffcd54cb723 (diff) | |
| download | qt-creator-0a4310d3148861062b9679e1415197b3a883164f.tar.gz | |
qmljs: added qmljsconstants.h
Moved Document::Language, Import::Type and StaticAnalysis::Severity
enums to qmljsconstants.h and renamed values removing the redundant
part.
Thus the effective length changed little or improved
(Document::QmlLanguage => Language::Qml).
The separate file allows better reuse of enum values without introducing
circular dependencies.
Change-Id: I5186d7c04f5d3f6c289068b919be5ff1ff118326
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsbundle.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsbundle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsbundle.cpp b/src/libs/qmljs/qmljsbundle.cpp index 8b2ff587b4..198808a9f2 100644 --- a/src/libs/qmljs/qmljsbundle.cpp +++ b/src/libs/qmljs/qmljsbundle.cpp @@ -288,14 +288,14 @@ bool QmlBundle::readFrom(QString path, QStringList *errors) return errs.isEmpty(); } -QmlBundle QmlLanguageBundles::bundleForLanguage(Document::Language l) const +QmlBundle QmlLanguageBundles::bundleForLanguage(Language::Enum l) const { if (m_bundles.contains(l)) return m_bundles.value(l); return QmlBundle(); } -void QmlLanguageBundles::mergeBundleForLanguage(Document::Language l, const QmlBundle &bundle) +void QmlLanguageBundles::mergeBundleForLanguage(Language::Enum l, const QmlBundle &bundle) { if (bundle.isEmpty()) return; @@ -305,14 +305,14 @@ void QmlLanguageBundles::mergeBundleForLanguage(Document::Language l, const QmlB m_bundles.insert(l,bundle); } -QList<Document::Language> QmlLanguageBundles::languages() const +QList<Language::Enum> QmlLanguageBundles::languages() const { return m_bundles.keys(); } void QmlLanguageBundles::mergeLanguageBundles(const QmlLanguageBundles &o) { - foreach (Document::Language l, o.languages()) + foreach (Language::Enum l, o.languages()) mergeBundleForLanguage(l, o.bundleForLanguage(l)); } |