4 files changed, 16 insertions, 16 deletions

diff --git a/share/qbs/modules/ib/IBModule.qbs b/share/qbs/modules/ib/IBModule.qbs
index d6e8c6c2e..0a0049733 100644
--- a/share/qbs/modules/ib/IBModule.qbs
+++ b/share/qbs/modules/ib/IBModule.qbs
@@ -88,9 +88,9 @@ Module {
                     print(process.readStdErr());
 
                 var plist = new PropertyList();
-                plist.read(process.readStdOut());
+                plist.readFromString(process.readStdOut());
 
-                plist = JSON.parse(plist.toJSON());
+                plist = JSON.parse(plist.toJSONString());
                 if (plist)
                     plist = plist["com.apple.ibtool.version"];
                 if (plist)
diff --git a/src/lib/corelib/jsextensions/propertylist.h b/src/lib/corelib/jsextensions/propertylist.h
index 33f8bccfd..a4d52e28d 100644
--- a/src/lib/corelib/jsextensions/propertylist.h
+++ b/src/lib/corelib/jsextensions/propertylist.h
@@ -49,10 +49,10 @@ public:
     static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
     PropertyList(QScriptContext *context);
     ~PropertyList();
-    Q_INVOKABLE void read(const QString &input);
-    Q_INVOKABLE void readFile(const QString &filePath);
-    Q_INVOKABLE QString toXML() const;
-    Q_INVOKABLE QString toJSON() const;
+    Q_INVOKABLE void readFromString(const QString &input);
+    Q_INVOKABLE void readFromFile(const QString &filePath);
+    Q_INVOKABLE QString toXMLString() const;
+    Q_INVOKABLE QString toJSONString() const;
 private:
     PropertyListPrivate *d;
 };
diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm
index 963f4192c..76dce37c2 100644
--- a/src/lib/corelib/jsextensions/propertylist.mm
+++ b/src/lib/corelib/jsextensions/propertylist.mm
@@ -66,7 +66,7 @@ public:
 
     id propertyListObject;
 
-    void read(QScriptContext *context, NSData *data);
+    void readFromData(QScriptContext *context, NSData *data);
 };
 
 void initializeJsExtensionPropertyList(QScriptValue extensionObject)
@@ -102,7 +102,7 @@ PropertyList::PropertyList(QScriptContext *context)
     Q_ASSERT(thisObject().engine() == engine());
 }
 
-void PropertyList::read(const QString &input)
+void PropertyList::readFromString(const QString &input)
 {
     Q_ASSERT(thisObject().engine() == engine());
     PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject());
@@ -110,10 +110,10 @@ void PropertyList::read(const QString &input)
     NSString *inputString = toNSString(input);
     NSData *data = [NSData dataWithBytes:[inputString UTF8String]
                             length:[inputString lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
-    p->d->read(p->context(), data);
+    p->d->readFromData(p->context(), data);
 }
 
-void PropertyList::readFile(const QString &filePath)
+void PropertyList::readFromFile(const QString &filePath)
 {
     Q_ASSERT(thisObject().engine() == engine());
     PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject());
@@ -121,13 +121,13 @@ void PropertyList::readFile(const QString &filePath)
     NSError *error;
     NSData *data = [NSData dataWithContentsOfFile:toNSString(filePath) options:0 error:&error];
     if (data) {
-        p->d->read(p->context(), data);
+        p->d->readFromData(p->context(), data);
     } else {
         p->context()->throwError(fromNSString([error localizedDescription]));
     }
 }
 
-void PropertyListPrivate::read(QScriptContext *context, NSData *data)
+void PropertyListPrivate::readFromData(QScriptContext *context, NSData *data)
 {
     NSError *error = nil;
     id plist = nil;
@@ -157,7 +157,7 @@ void PropertyListPrivate::read(QScriptContext *context, NSData *data)
     propertyListObject = [plist retain];
 }
 
-QString PropertyList::toXML() const
+QString PropertyList::toXMLString() const
 {
     PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject());
     if (!p->d->propertyListObject)
@@ -187,7 +187,7 @@ QString PropertyList::toXML() const
                                                encoding:NSUTF8StringEncoding] autorelease]);
 }
 
-QString PropertyList::toJSON() const
+QString PropertyList::toJSONString() const
 {
     PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject());
     if (!p->d->propertyListObject)
diff --git a/tests/auto/blackbox/testdata/jsextensions/propertylist.qbs b/tests/auto/blackbox/testdata/jsextensions/propertylist.qbs
index 94a1e1b31..cdd1c1af3 100644
--- a/tests/auto/blackbox/testdata/jsextensions/propertylist.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions/propertylist.qbs
@@ -22,11 +22,11 @@ Product {
 
         var xmlfile = new TextFile("test.xml", TextFile.ReadOnly);
         var propertyList = new PropertyList();
-        propertyList.read(xmlfile.readAll());
+        propertyList.readFromString(xmlfile.readAll());
         xmlfile.close();
 
         var jsontextfile = new TextFile("test.json", TextFile.WriteOnly);
-        jsontextfile.write(propertyList.toJSON());
+        jsontextfile.write(propertyList.toJSONString());
         jsontextfile.close();
 
         process = new Process();