From 964ca1d1e158403bd64402c32a32d101c1039ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 25 Feb 2012 17:19:39 +0100 Subject: Reverting changes wrongly pushed to lp:~3v1n0/unity/lim They come from the lim-panel branch... Sorry for that. (bzr r1858.9.171) --- UnityCore/Variant.cpp | 37 +------------------------------------ UnityCore/Variant.h | 6 ------ 2 files changed, 1 insertion(+), 42 deletions(-) (limited to 'UnityCore') diff --git a/UnityCore/Variant.cpp b/UnityCore/Variant.cpp index df372b07c..fe8c96452 100644 --- a/UnityCore/Variant.cpp +++ b/UnityCore/Variant.cpp @@ -142,44 +142,9 @@ BuilderWrapper& BuilderWrapper::add(char const* name, int value) return *this; } -BuilderWrapper& BuilderWrapper::add(char const* name, long int value) -{ - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_int64(value)); - return *this; -} - -BuilderWrapper& BuilderWrapper::add(char const* name, long long int value) -{ - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_int64(value)); - return *this; -} - -BuilderWrapper& BuilderWrapper::add(char const* name, unsigned int value) -{ - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_uint32(value)); - return *this; -} - -BuilderWrapper& BuilderWrapper::add(char const* name, long unsigned int value) -{ - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_uint64(value)); - return *this; -} - -BuilderWrapper& BuilderWrapper::add(char const* name, long long unsigned int value) -{ - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_uint64(value)); - return *this; -} - BuilderWrapper& BuilderWrapper::add(char const* name, float value) { - g_variant_builder_add(builder_, "{sv}", name, g_variant_new_double(value)); - return *this; -} - -BuilderWrapper& BuilderWrapper::add(char const* name, double value) -{ + // floats get promoted to doubles automatically g_variant_builder_add(builder_, "{sv}", name, g_variant_new_double(value)); return *this; } diff --git a/UnityCore/Variant.h b/UnityCore/Variant.h index b9ee024dc..8001cdc09 100644 --- a/UnityCore/Variant.h +++ b/UnityCore/Variant.h @@ -73,13 +73,7 @@ public: BuilderWrapper& add(char const* name, char const* value); BuilderWrapper& add(char const* name, std::string const& value); BuilderWrapper& add(char const* name, int value); - BuilderWrapper& add(char const* name, long int value); - BuilderWrapper& add(char const* name, long long int value); - BuilderWrapper& add(char const* name, unsigned int value); - BuilderWrapper& add(char const* name, long unsigned int value); - BuilderWrapper& add(char const* name, long long unsigned int value); BuilderWrapper& add(char const* name, float value); - BuilderWrapper& add(char const* name, double value); BuilderWrapper& add(char const* name, GVariant* value); BuilderWrapper& add(nux::Rect const& value); -- cgit v1.2.3