Rename Variant's check_type function to has_type

diff --git a/source/core/variant.h b/source/core/variant.h
index 04c372b54ef305205e6f38e661a408eab75d18d6..934a9e539276e3ad406a6b05b00e01cd3d964ca0 100644 (file)
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -61,9 +61,14 @@ public:
        const T &value() const { return const_cast<Variant *>(this)->get<T>(); }
 
        template<typename T>
-       bool check_type() const { return funcs==get_functions<typename std::remove_cv<T>::type>(); }
+       bool has_type() const { return funcs==get_functions<typename std::remove_cv<T>::type>(); }
 
-       bool check_same_type(const Variant &v) const { return (funcs && funcs==v.funcs); }
+       bool has_same_type(const Variant &v) const { return (funcs && funcs==v.funcs); }
+
+       template<typename T>
+       DEPRECATED bool check_type() const { return has_type<T>(); }
+
+       DEPRECATED bool check_same_type(const Variant &v) const { return has_same_type(v); }
 
        bool operator==(const Variant &v) const { return (has_same_type(v) && funcs->compare(storage, v.storage)); }
        bool operator!=(const Variant &v) const { return !(operator==(v)); }

diff --git a/tests/variant.cpp b/tests/variant.cpp
index 99cacdf29eb3ff550f509aa575ba54b491ac45dc..8ec89722197f4742e17164f2f251741c8a6ebd62 100644 (file)
--- a/tests/variant.cpp
+++ b/tests/variant.cpp
@@ -99,11 +99,11 @@ void VariantTests::destruction()
 void VariantTests::types()
 {
        Variant var = 42U;
-       EXPECT(!var.check_type<int>());
-       EXPECT(var.check_type<unsigned>());
-       EXPECT(!var.check_type<float>());
-       EXPECT(!var.check_type<bool>());
-       EXPECT(!var.check_type<string>());
+       EXPECT(!var.has_type<int>());
+       EXPECT(var.has_type<unsigned>());
+       EXPECT(!var.has_type<float>());
+       EXPECT(!var.has_type<bool>());
+       EXPECT(!var.has_type<string>());
 }
 
 void VariantTests::mismatch()