Merge pull request #2734 from bontibon/objectpropconvert

* Support converting object reference property to and from int.
* Support converting file path property to and from string.

src/libtiled/properties.cpp

@@ -36,6 +36,20 @@
 
 namespace Tiled {
 
+QString FilePath::toString(const FilePath &path)
+{
+    return path.url.toString(QUrl::PreferLocalFile);
+}
+
+FilePath FilePath::fromString(const QString &string)
+{
+    QUrl url(string);
+    if (url.isRelative())
+        url = QUrl::fromLocalFile(string);
+    return { url };
+}
+
+
 void mergeProperties(Properties &target, const Properties &source)
 {
     // Based on QMap::unite, but using insert instead of insertMulti
@@ -158,13 +172,11 @@ QVariant toExportValue(const QVariant &value)
         return color.isValid() ? color.name(QColor::HexArgb) : QString();
     }
 
-    if (type == filePathTypeId()) {
-        const FilePath filePath = value.value<FilePath>();
-        return filePath.url.toString(QUrl::PreferLocalFile);
-    }
+    if (type == filePathTypeId())
+        return FilePath::toString(value.value<FilePath>());
 
     if (type == objectRefTypeId())
-        return value.value<ObjectRef>().id;
+        return ObjectRef::toInt(value.value<ObjectRef>());
 
     return value;
 }
@@ -177,15 +189,11 @@ QVariant fromExportValue(const QVariant &value, int type)
     if (value.userType() == type)
         return value;
 
-    if (type == filePathTypeId()) {
-        QUrl url(value.toString());
-        if (url.isRelative())
-            url = QUrl::fromLocalFile(value.toString());
-        return QVariant::fromValue(FilePath { url });
-    }
+    if (type == filePathTypeId())
+        return QVariant::fromValue(FilePath::fromString(value.toString()));
 
     if (type == objectRefTypeId())
-        return QVariant::fromValue(ObjectRef { value.toInt() });
+        return QVariant::fromValue(ObjectRef::fromInt(value.toInt()));
 
     QVariant variant(value);
     variant.convert(type);
@@ -212,4 +220,13 @@ QVariant fromExportValue(const QVariant &value, int type, const QDir &dir)
     return fromExportValue(value, type);
 }
 
+void initializeMetatypes()
+{
+    QMetaType::registerConverter<ObjectRef, int>(&ObjectRef::toInt);
+    QMetaType::registerConverter<int, ObjectRef>(&ObjectRef::fromInt);
+
+    QMetaType::registerConverter<FilePath, QString>(&FilePath::toString);
+    QMetaType::registerConverter<QString, FilePath>(&FilePath::fromString);
+}
+
 } // namespace Tiled

src/libtiled/properties.h

@@ -46,6 +46,9 @@ class TILEDSHARED_EXPORT FilePath
 
 public:
     QUrl url;
+
+    static QString toString(const FilePath &path);
+    static FilePath fromString(const QString &string);
 };
 
 struct TILEDSHARED_EXPORT ObjectRef
@@ -55,6 +58,9 @@ struct TILEDSHARED_EXPORT ObjectRef
 
 public:
     int id;
+
+    static int toInt(const ObjectRef &ref) { return ref.id; }
+    static ObjectRef fromInt(int id) { return ObjectRef { id }; }
 };
 
 class TILEDSHARED_EXPORT AggregatedPropertyData
@@ -123,6 +129,8 @@ TILEDSHARED_EXPORT QVariant fromExportValue(const QVariant &value, int type);
 TILEDSHARED_EXPORT QVariant toExportValue(const QVariant &value, const QDir &dir);
 TILEDSHARED_EXPORT QVariant fromExportValue(const QVariant &value, int type, const QDir &dir);
 
+TILEDSHARED_EXPORT void initializeMetatypes();
+
 } // namespace Tiled
 
 Q_DECLARE_METATYPE(Tiled::FilePath)

src/tiled/main.cpp

@@ -355,6 +355,8 @@ int main(int argc, char *argv[])
 
     TiledApplication a(argc, argv);
 
+    initializeMetatypes();
+
     a.setOrganizationDomain(QLatin1String("mapeditor.org"));
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     a.setApplicationName(QLatin1String("Tiled"));

src/tiled/propertiesdock.cpp

@@ -395,6 +395,7 @@ void PropertiesDock::showContextMenu(const QPoint& pos)
             QVariant::Color,
             QVariant::Double,
             filePathTypeId(),
+            objectRefTypeId(),
             QVariant::Int,
             QVariant::String
         };

src/tiled/propertybrowser.cpp

@@ -443,17 +443,17 @@ void PropertyBrowser::propertyAdded(Object *object, const QString &name)
 {
     if (!objectPropertiesRelevant(mDocument, object))
         return;
-    if (mNameToProperty.contains(name)) {
+    if (QtVariantProperty *property = mNameToProperty.value(name)) {
         if (propertyValueAffected(mObject, object, name))
-            setCustomPropertyValue(mNameToProperty[name], object->property(name));
+            setCustomPropertyValue(property, object->property(name));
     } else {
         QVariant value;
         if (mObject->hasProperty(name))
             value = mObject->property(name);
         else
             value = predefinedPropertyValue(mObject, name);
 
-        createCustomProperty(name, value);
+        createCustomProperty(name, toDisplayValue(value));
     }
     updateCustomPropertyColor(name);
 }
@@ -1516,9 +1516,8 @@ QtVariantProperty *PropertyBrowser::createCustomProperty(const QString &name, co
     }
 
     mUpdating = true;
-    const QVariant displayValue = toDisplayValue(value);
-    QtVariantProperty *property = createProperty(CustomProperty, displayValue.userType(), name);
-    property->setValue(displayValue);
+    QtVariantProperty *property = createProperty(CustomProperty, value.userType(), name);
+    property->setValue(value);
     mCustomPropertiesGroup->insertSubProperty(property, precedingProperty);
 
     // Collapse custom color properties, to save space
@@ -1539,20 +1538,22 @@ void PropertyBrowser::deleteCustomProperty(QtVariantProperty *property)
 void PropertyBrowser::setCustomPropertyValue(QtVariantProperty *property,
                                              const QVariant &value)
 {
-    if (value.userType() != property->valueType()) {
+    const QVariant displayValue = toDisplayValue(value);
+
+    if (displayValue.userType() != property->valueType()) {
         // Re-creating the property is necessary to change its type
         const QString name = property->propertyName();
         const bool wasCurrent = currentItem() && currentItem()->property() == property;
 
         deleteCustomProperty(property);
-        property = createCustomProperty(name, value);
+        property = createCustomProperty(name, displayValue);
         updateCustomPropertyColor(name);
 
         if (wasCurrent)
             setCurrentItem(items(property).constFirst());
     } else {
         mUpdating = true;
-        property->setValue(toDisplayValue(value));
+        property->setValue(displayValue);
         mUpdating = false;
     }
 }

src/tiled/variantpropertymanager.cpp

@@ -89,9 +89,9 @@ bool VariantPropertyManager::isPropertyTypeSupported(int propertyType) const
 int VariantPropertyManager::valueType(int propertyType) const
 {
     if (propertyType == filePathTypeId())
-        return QVariant::String;
+        return propertyType;
     if (propertyType == displayObjectRefTypeId())
-        return QVariant::String;
+        return propertyType;
     if (propertyType == tilesetParametersTypeId())
         return qMetaTypeId<TilesetDocument*>();
     if (propertyType == alignmentTypeId())