From 35473d9fd27f27631ff65a0bafd5c31ce4cc5809 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 31 Jul 2013 17:53:56 +0200
Subject: [PATCH] QmlDesigner.MetaInfo: rename qml() to qmlPath()

qml() is too ambiguous.

Change-Id: I7b56f53f64ce349657e3a462769c11880a1afe04
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
 .../qmldesigner/designercore/include/itemlibraryinfo.h        | 4 ++--
 .../qmldesigner/designercore/metainfo/itemlibraryinfo.cpp     | 4 ++--
 .../qmldesigner/designercore/metainfo/metainforeader.cpp      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index 4374aa0030a..6218a04c429 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -69,7 +69,7 @@ public:
     int minorVersion() const;
     QString category() const;
     QIcon dragIcon() const;
-    QString qml() const;
+    QString qmlPath() const;
     QString qmlSource() const;
     QString requiredImport() const;
     bool forceImport() const;
@@ -89,7 +89,7 @@ public:
     void setDragIcon(const QIcon &icon);
     void setIcon(const QIcon &icon);
     void setCategory(const QString &category);
-    void setQml(const QString &qml);
+    void setQmlPath(const QString &qml);
     void setRequiredImport(const QString &requiredImport);
     void setForceImport(bool b);
 private:
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 023590bd0c4..c59e554cf81 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -121,7 +121,7 @@ TypeName ItemLibraryEntry::typeName() const
     return m_data->typeName;
 }
 
-QString ItemLibraryEntry::qml() const
+QString ItemLibraryEntry::qmlPath() const
 {
     return m_data->qml;
 }
@@ -199,7 +199,7 @@ static QString getSourceForUrl(const QString &fileURl)
     }
 }
 
-void ItemLibraryEntry::setQml(const QString &qml)
+void ItemLibraryEntry::setQmlPath(const QString &qml)
 {
     m_data->qml = qml;
 
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index f697b3127c5..7bb5224cdea 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -252,7 +252,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v
 void MetaInfoReader::readQmlSourceProperty(const QString &name, const QVariant &value)
 {
     if (name == QLatin1String("source")) {
-        m_currentEntry.setQml(absoluteFilePathForDocument(value.toString()));
+        m_currentEntry.setQmlPath(absoluteFilePathForDocument(value.toString()));
     } else {
         addError(tr("Unknown property for QmlSource %1").arg(name), currentSourceLocation());
         setParserState(Error);