Lua plugin: Fixed group layers being exported with "imagelayer" type

Also avoided some implicit type conversions. Closes #1595
mapeditor · Jun 5, 2017 · fa73525 · fa73525
1 parent 925b7ca
commit fa73525
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp
@@ -472,7 +472,7 @@ void LuaPlugin::writeGroupLayer(LuaTableWriter &writer,
 {
     writer.writeStartTable();
 
-    writer.writeKeyAndValue("type", "imagelayer");
+    writer.writeKeyAndValue("type", "group");
     writer.writeKeyAndValue("name", groupLayer->name());
     writer.writeKeyAndValue("visible", groupLayer->isVisible());
     writer.writeKeyAndValue("opacity", groupLayer->opacity());

diff --git a/src/plugins/lua/luatablewriter.cpp b/src/plugins/lua/luatablewriter.cpp
@@ -221,7 +221,7 @@ void LuaTableWriter::writeNewline()
     }
 }
 
-void LuaTableWriter::write(const char *bytes, unsigned length)
+void LuaTableWriter::write(const char *bytes, qint64 length)
 {
     if (m_device->write(bytes, length) != length)
         m_error = true;

diff --git a/src/plugins/lua/luatablewriter.h b/src/plugins/lua/luatablewriter.h
@@ -53,6 +53,7 @@ class LuaTableWriter
 
     void writeKeyAndValue(const QByteArray &key, int value);
     void writeKeyAndValue(const QByteArray &key, unsigned value);
+    void writeKeyAndValue(const QByteArray &key, float value);
     void writeKeyAndValue(const QByteArray &key, double value);
     void writeKeyAndValue(const QByteArray &key, bool value);
     void writeKeyAndValue(const QByteArray &key, const char *value);
@@ -77,7 +78,7 @@ class LuaTableWriter
     void writeIndent();
 
     void writeNewline();
-    void write(const char *bytes, unsigned length);
+    void write(const char *bytes, qint64 length);
     void write(const char *bytes);
     void write(const QByteArray &bytes);
     void write(char c);
@@ -106,6 +107,9 @@ inline void LuaTableWriter::writeKeyAndValue(const QByteArray &key, int value)
 inline void LuaTableWriter::writeKeyAndValue(const QByteArray &key, unsigned value)
 { writeKeyAndUnquotedValue(key, QByteArray::number(value)); }
 
+inline void LuaTableWriter::writeKeyAndValue(const QByteArray &key, float value)
+{ writeKeyAndValue(key, static_cast<double>(value)); }
+
 inline void LuaTableWriter::writeKeyAndValue(const QByteArray &key, double value)
 { writeKeyAndUnquotedValue(key, QByteArray::number(value)); }