Mercurial > hg > dmlib

changeset 379:05e85401480a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename eddemoobj to edtlobj, etc.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 17 Oct 2012 03:40:30 +0300
parents feaeec4c6c55
children ccb6e5108953
files Makefile.gen eddemoobj.cpp eddemoobj.h edmain.cpp edmain.h edtlobj.cpp edtlobj.h
diffstat 7 files changed, 86 insertions(+), 88 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Wed Oct 17 03:33:19 2012 +0300
+++ b/Makefile.gen	Wed Oct 17 03:40:30 2012 +0300
@@ -23,8 +23,8 @@
 
 EDITOR_PRO = editor.pro
 EDITOR_MAKEFILE = Makefile.editor
-EDITOR_SOURCES = edmain.cpp edgui.cpp eddemoobj.cpp edtimeline.cpp edwaveform.cpp
-EDITOR_HEADERS = edmain.h eddemoobj.h edtimeline.h edwaveform.h
+EDITOR_SOURCES = edmain.cpp edgui.cpp edtlobj.cpp edtimeline.cpp edwaveform.cpp
+EDITOR_HEADERS = edmain.h edtlobj.h edtimeline.h edwaveform.h
 
 
 ###
--- a/eddemoobj.cpp	Wed Oct 17 03:33:19 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-//
-// Map Mask Designer -- Map object and map region classes
-// (C) Copyright 2012 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
-//
-#include "eddemoobj.h"
-#include "dmres.h"
-#include <QFileInfo>
-
-//////////////////////////////////////////////////////////////////////////////
-
-TimelineObject::TimelineObject()
-{
-    tl = NULL;
-    changed = 0;
-}
-
-
-// Create a copy of the given mapobject
-TimelineObject::TimelineObject(TimelineObject *obj)
-{
-    changed = 0;
-    filename = obj->filename;
-}
-
-
-TimelineObject::~TimelineObject()
-{
-}
-
-int TimelineObject::load(QString mfilename)
-{
-    QByteArray fnba = mfilename.toUtf8();
-    DMResource *res;
-    if ((res = dmf_create_stdio(fnba.data(), "rb")) == NULL)
-        return DMERR_FOPEN;
-
-    int err = dmLoadTimeline(res, &tl);
-
-    dmf_close(res);
-    filename = mfilename;
-    return err;
-}
-
-
-int TimelineObject::save(QString mfilename)
-{
-    QByteArray fnba = mfilename.toUtf8();
-    DMResource *res;
-    if ((res = dmf_create_stdio(fnba.data(), "wb")) == NULL)
-        return DMERR_FOPEN;
-
-    int err = dmSaveTimeline(res, tl);
-
-    dmf_close(res);
-    return err;
-}
--- a/eddemoobj.h	Wed Oct 17 03:33:19 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// Demo Editor -- Demo state object
-// (C) Copyright 2012 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
-//
-#ifndef TIMELINEOBJECT_H
-#define TIMELINEOBJECT_H
-
-#include "dmengine.h"
-#include <QString>
-
-class TimelineObject
-{
-public:
-    QString state;
-    QString filename;
-    int changed;
-    DMTimeline *tl;
-
-    TimelineObject();
-    TimelineObject(TimelineObject *);
-    ~TimelineObject();
-
-    int load(QString filename);
-    int save(QString filename);
-};
-
-
-#endif
--- a/edmain.cpp	Wed Oct 17 03:33:19 2012 +0300
+++ b/edmain.cpp	Wed Oct 17 03:40:30 2012 +0300
@@ -5,7 +5,6 @@
 #include <SDL.h>
 #include "dmengine.h"
 #include "edmain.h"
-#include "eddemoobj.h"
 #include <QSettings>
 #include <QGLWidget>
 
--- a/edmain.h	Wed Oct 17 03:33:19 2012 +0300
+++ b/edmain.h	Wed Oct 17 03:40:30 2012 +0300
@@ -9,7 +9,7 @@
 #define DOC_DEF_FILENAME  "Untitled"
 #define DOC_UNDO_MAX	  30
 
-#include "eddemoobj.h"
+#include "edtlobj.h"
 
 #include <QDebug>
 #include <QFile>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/edtlobj.cpp	Wed Oct 17 03:40:30 2012 +0300
@@ -0,0 +1,55 @@
+//
+// Map Mask Designer -- Map object and map region classes
+// (C) Copyright 2012 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
+//
+#include "edtlobj.h"
+#include "dmres.h"
+
+
+TimelineObject::TimelineObject()
+{
+    tl = NULL;
+    changed = 0;
+}
+
+
+TimelineObject::TimelineObject(TimelineObject *obj)
+{
+    changed = 0;
+    filename = obj->filename;
+}
+
+
+TimelineObject::~TimelineObject()
+{
+    dmFreeTimeline(tl);
+}
+
+
+int TimelineObject::load(QString mfilename)
+{
+    QByteArray fnba = mfilename.toUtf8();
+    DMResource *res;
+    if ((res = dmf_create_stdio(fnba.data(), "rb")) == NULL)
+        return DMERR_FOPEN;
+
+    int err = dmLoadTimeline(res, &tl);
+
+    dmf_close(res);
+    filename = mfilename;
+    return err;
+}
+
+
+int TimelineObject::save(QString mfilename)
+{
+    QByteArray fnba = mfilename.toUtf8();
+    DMResource *res;
+    if ((res = dmf_create_stdio(fnba.data(), "wb")) == NULL)
+        return DMERR_FOPEN;
+
+    int err = dmSaveTimeline(res, tl);
+
+    dmf_close(res);
+    return err;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/edtlobj.h	Wed Oct 17 03:40:30 2012 +0300
@@ -0,0 +1,28 @@
+//
+// Demo Editor -- Demo state object
+// (C) Copyright 2012 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
+//
+#ifndef TIMELINEOBJECT_H
+#define TIMELINEOBJECT_H
+
+#include "dmengine.h"
+#include <QString>
+
+class TimelineObject
+{
+public:
+    QString state;
+    QString filename;
+    int changed;
+    DMTimeline *tl;
+
+    TimelineObject();
+    TimelineObject(TimelineObject *);
+    ~TimelineObject();
+
+    int load(QString filename);
+    int save(QString filename);
+};
+
+
+#endif