Mercurial > hg > dmlib

diff editor/edtlobj.cpp @ 1738:b4992d9f72fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 09 Jun 2018 13:05:22 +0300
parents 93d1050eac99
children
line wrap: on
line diff
--- a/editor/edtlobj.cpp	Fri Jun 08 22:32:30 2018 +0300
+++ b/editor/edtlobj.cpp	Sat Jun 09 13:05:22 2018 +0300
@@ -30,13 +30,14 @@
 
 int EDTimelineObject::load(QString mfilename)
 {
-    QByteArray fnba = mfilename.toUtf8();
     DMResource *res;
     DMTimeline *tmp;
-    if ((res = dmf_open_stdio(fnba.data(), "rb")) == NULL)
-        return DMERR_FOPEN;
+    int err;
 
-    int err = dmLoadTimeline(res, &tmp);
+    if ((err = dmf_open_stdio(mfilename.toUtf8().constData(), "rb", &res)) != DMERR_OK)
+        return err;
+
+    err = dmLoadTimeline(res, &tmp);
     dmf_close(res);
 
     if (err == DMERR_OK)
@@ -59,12 +60,13 @@
 
 int EDTimelineObject::save(QString mfilename)
 {
-    QByteArray fnba = mfilename.toUtf8();
     DMResource *res;
-    if ((res = dmf_open_stdio(fnba.data(), "wb")) == NULL)
-        return DMERR_FOPEN;
+    int err;
 
-    int err = dmSaveTimeline(res, tl);
+    if ((err = dmf_open_stdio(mfilename.toUtf8().constData(), "wb", &res)) != DMERR_OK)
+        return err;
+
+    err = dmSaveTimeline(res, tl);
     scrub();
 
     dmf_close(res);