Changeset 737 for cpp/frams

Timestamp:

02/17/18 19:03:18 (7 years ago)

Author:

Maciej Komosinski

Message:

Made destructors virtual to avoid compiler warnings

Location:

cpp/frams

Files:

• _demos/geometry/geometrytestutils.cpp (modified) (1 diff)
• canvas/nn_layout.h (modified) (1 diff)
• param/multiparamload.h (modified) (1 diff)
• param/mutableparam.h (modified) (3 diffs)

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -46 +46 @@
 public:
         virtual void operator()(Model &model) = 0;
+        virtual ~TestInvoker() {}
 };
 

cpp/frams/canvas/nn_layout.h

@@ -24 +24 @@
         // layout function user can use this to retrieve the resulting element layout:
         virtual int *GetXYWH(int el) = 0;               ///< @return current element (el=0..N-1) position and size ret[0],[1],[2],[3]=x,y,w,h
+
+        virtual ~NNLayoutState() {}
 };
 

cpp/frams/param/multiparamload.h

@@ -64 +64 @@
         MultiParamLoader(const char* filename) { init(); load(filename); }
 
-        ~MultiParamLoader() { abort(); clearObjects(); }
+        virtual ~MultiParamLoader() { abort(); clearObjects(); }
 
         void reset();

cpp/frams/param/mutableparam.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -14 +14 @@
 class VMCode;
 
-class MutableParam: public SimpleAbstractParam, public MutableParamInterface 
+class MutableParam : public SimpleAbstractParam, public MutableParamInterface
 {
-static const int staticprops=7;
-static ParamEntry pe_tab[];
-/** group #0 cannot be removed by scripting  */
-int persistgroup0;
-SString grprefix;
-SList entries;
-SList groups;
-int changed;
-ParamEntry *entry(int i) {return (i<staticprops)? pe_tab+i : ((ParamEntry*)entries(i-staticprops));}
-void *getTarget(int i) {return (i<staticprops)? SimpleAbstractParam::getTarget(i) : (void*)entry(i)->offset;}
-void call(int i,ExtValue* args,ExtValue *ret);
-  public:
-void clear(int everything=0);
-int firstMutableIndex() {return staticprops;}
-SString& groupname(int g) {return *((SString*)groups(g));}
-MutableParam(const char*n=0,const char*g=0,int gr0=1);
-void setGroupName(const SString &n,int g=0) {groupname(g)=n;}
-~MutableParam() {clear(1);}
-int getGroupCount() {return groups.size();}
-int getPropCount() {return entries.size()+staticprops;}
-const char *grname(int i) {return (i>=groups.size()) ? 0 : groupname(i).c_str();}
-int grmember(int g,int a);
+        static const int staticprops = 7;
+        static ParamEntry pe_tab[];
+        /** group #0 cannot be removed by scripting  */
+        int persistgroup0;
+        SString grprefix;
+        SList entries;
+        SList groups;
+        int changed;
+        ParamEntry *entry(int i) { return (i < staticprops) ? pe_tab + i : ((ParamEntry*)entries(i - staticprops)); }
+        void *getTarget(int i) { return (i < staticprops) ? SimpleAbstractParam::getTarget(i) : (void*)entry(i)->offset; }
+        void call(int i, ExtValue* args, ExtValue *ret);
+public:
+        void clear(int everything = 0);
+        int firstMutableIndex() { return staticprops; }
+        SString& groupname(int g) { return *((SString*)groups(g)); }
+        MutableParam(const char*n = 0, const char*g = 0, int gr0 = 1);
+        void setGroupName(const SString &n, int g = 0) { groupname(g) = n; }
+        ~MutableParam() { clear(1); }
+        int getGroupCount() { return groups.size(); }
+        int getPropCount() { return entries.size() + staticprops; }
+        const char *grname(int i) { return (i >= groups.size()) ? 0 : groupname(i).c_str(); }
+        int grmember(int g, int a);
 
-int addGroup(const SString& gname,int noprefix=0);
-void removeGroup(int pos);
+        int addGroup(const SString& gname, int noprefix = 0);
+        void removeGroup(int pos);
 
-int findGroup(const SString name,int ignoreprefix=0);
+        int findGroup(const SString name, int ignoreprefix = 0);
 
-/** @param data pointer to the variable. 0 will allocate new variable
-    @param position -1 = after the last one  */
-int addProperty(void* data,const char* id,const char* type,const char* name,const char* help=0,int flags=0,int group=0,int position=-1);
+        /** @param data pointer to the variable. 0 will allocate new variable
+                @param position -1 = after the last one  */
+        int addProperty(void* data, const char* id, const char* type, const char* name, const char* help = 0, int flags = 0, int group = 0, int position = -1);
 
-int addProperty(ParamEntry *pe,int position=-1);
-ParamEntry * removeProperty(ParamEntry *pe);
-ParamEntry * removeProperty(int i);
+        int addProperty(ParamEntry *pe, int position = -1);
+        ParamEntry * removeProperty(ParamEntry *pe);
+        ParamEntry * removeProperty(int i);
 
-void notify(int id);
+        void notify(int id);
 
-int setInt(int,paInt);
-int setDouble(int,double);
-int setString(int,const SString &);
-int setObject(int,const ExtObject &);
-int setExtValue(int,const ExtValue &);
+        int setInt(int, paInt);
+        int setDouble(int, double);
+        int setString(int, const SString &);
+        int setObject(int, const ExtObject &);
+        int setExtValue(int, const ExtValue &);
 
 #define STATRICKCLASS MutableParam
-PARAMPROCDEF(p_clear);
-PARAMPROCDEF(p_addprop);
-PARAMPROCDEF(p_remprop);
-PARAMPROCDEF(p_addgroup);
-PARAMPROCDEF(p_remgroup);
-PARAMGETDEF(changedname) {arg1->setString(id(changed));}
+        PARAMPROCDEF(p_clear);
+        PARAMPROCDEF(p_addprop);
+        PARAMPROCDEF(p_remprop);
+        PARAMPROCDEF(p_addgroup);
+        PARAMPROCDEF(p_remgroup);
+        PARAMGETDEF(changedname) { arg1->setString(id(changed)); }
 #undef STATRICKCLASS
 };
@@ -72 +72 @@
 class ParamSaver
 {
-SList store;
-  public:
-virtual bool shouldLoad(ParamInterface &pi,int i) {return true;}
-ParamSaver() {}
-ParamSaver(ParamInterface &pi) {loadFrom(pi);}
-~ParamSaver() {clear();}
-void loadFrom(ParamInterface& p);
-void saveTo(MutableParam& p);
-void clear();
+        SList store;
+public:
+        virtual bool shouldLoad(ParamInterface &pi, int i) { return true; }
+        ParamSaver() {}
+        ParamSaver(ParamInterface &pi) { loadFrom(pi); }
+        virtual ~ParamSaver() { clear(); }
+        void loadFrom(ParamInterface& p);
+        void saveTo(MutableParam& p);
+        void clear();
 };