diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2012-02-25 17:19:39 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2012-02-25 17:19:39 +0100 |
| commit | 964ca1d1e158403bd64402c32a32d101c1039ab8 (patch) | |
| tree | d525303963caddc337ac55dd807493acea3be1f0 /UnityCore | |
| parent | 7a5ecdab78190a96ba3387658c693937141c0566 (diff) | |
Reverting changes wrongly pushed to lp:~3v1n0/unity/lim
They come from the lim-panel branch... Sorry for that. (bzr r1858.9.171)
Diffstat (limited to 'UnityCore')
| -rw-r--r-- | UnityCore/Variant.cpp | 37 | ||||
| -rw-r--r-- | UnityCore/Variant.h | 6 |
2 files changed, 1 insertions, 42 deletions
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); |
