X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvalue.h;h=d97c7c31980638693b913b687f564914d444094c;hb=f58976091159c98751ae9bc2dd75c8d90f5f3b9c;hp=3c41949ece28abcd46d0d1e19b15296b010048ba;hpb=8cfa359f1ee073ce0a180b805a67e4f84ef09a76;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/value.h b/synfig-core/trunk/src/synfig/value.h index 3c41949..d97c7c3 100644 --- a/synfig-core/trunk/src/synfig/value.h +++ b/synfig-core/trunk/src/synfig/value.h @@ -226,7 +226,7 @@ public: // === GET MEMBERS ======================================================== template - const T &get(const T& x)const + const T &get(const T& x __attribute__ ((unused)))const { assert(is_valid() && same_type_as(x)); return *static_cast(data); @@ -280,31 +280,34 @@ public: //! Returns a string containing the name of the given Type static String type_name(Type id); + //! Returns a string containing the translated name of the given Type + static String type_local_name(Type id); + //! Returns a the corresponding Type of the described type static Type ident_type(const String &str); // === GET TYPE MEMBERS =================================================== - static const Type get_type(bool) { return TYPE_BOOL; } - static const Type get_type(int) { return TYPE_INTEGER; } - static const Type get_type(const Time&) { return TYPE_TIME; } - static const Type get_type(const Real&) { return TYPE_REAL; } - static const Type get_type(const float&) { return TYPE_REAL; } - static const Type get_type(const Vector&) { return TYPE_VECTOR; } - static const Type get_type(const Color&) { return TYPE_COLOR; } - static const Type get_type(const Segment&) { return TYPE_SEGMENT; } - static const Type get_type(const BLinePoint&) { return TYPE_BLINEPOINT; } - static const Type get_type(const String&) { return TYPE_STRING; } - static const Type get_type(const Gradient&) { return TYPE_GRADIENT; } - static const Type get_type(Canvas*) { return TYPE_CANVAS; } - static const Type get_type(const etl::handle&) + static Type get_type(bool) { return TYPE_BOOL; } + static Type get_type(int) { return TYPE_INTEGER; } + static Type get_type(const Time&) { return TYPE_TIME; } + static Type get_type(const Real&) { return TYPE_REAL; } + static Type get_type(const float&) { return TYPE_REAL; } + static Type get_type(const Vector&) { return TYPE_VECTOR; } + static Type get_type(const Color&) { return TYPE_COLOR; } + static Type get_type(const Segment&) { return TYPE_SEGMENT; } + static Type get_type(const BLinePoint&) { return TYPE_BLINEPOINT; } + static Type get_type(const String&) { return TYPE_STRING; } + static Type get_type(const Gradient&) { return TYPE_GRADIENT; } + static Type get_type(Canvas*) { return TYPE_CANVAS; } + static Type get_type(const etl::handle&) { return TYPE_CANVAS; } - static const Type get_type(const etl::loose_handle&) + static Type get_type(const etl::loose_handle&) { return TYPE_CANVAS; } - static const Type get_type(const list_type&) { return TYPE_LIST; } - template static const Type get_type(const std::vector &/*x*/) + static Type get_type(const list_type&) { return TYPE_LIST; } + template static Type get_type(const std::vector &/*x*/) { return TYPE_LIST; } - template static const Type get_type(const std::list &/*x*/) + template static Type get_type(const std::list &/*x*/) { return TYPE_LIST; } // ======================================================================== @@ -338,13 +341,13 @@ public: half get(const half &)const { return get(Real()); } void put(half*x)const { *x=get(Real()); } void set(const half &x) { _set(Real(x)); } - static const Type get_type(const half&) { return TYPE_REAL; } + static Type get_type(const half&) { return TYPE_REAL; } operator half()const { return get(Real()); } #endif #ifndef SYNFIG_NO_ANGLE operator const Angle&()const { return get(Angle()); } - static const Type get_type(const Angle&) { return TYPE_ANGLE; } + static Type get_type(const Angle&) { return TYPE_ANGLE; } #endif template