diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/src/varianttype.ccg | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-gir-gmmproc.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/src/varianttype.ccg')
-rw-r--r-- | glib/src/varianttype.ccg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/src/varianttype.ccg b/glib/src/varianttype.ccg index 71d34d9a..5a3702f8 100644 --- a/glib/src/varianttype.ccg +++ b/glib/src/varianttype.ccg @@ -27,7 +27,7 @@ VariantType::VariantType(const GVariantType* castitem) if(castitem) gobject_ = g_variant_type_copy(castitem); else - gobject_ = 0; + gobject_ = nullptr; } VariantType::VariantType(const std::string& type_string) @@ -45,7 +45,7 @@ VariantType& VariantType::operator=(const GVariantType* castitem) if(castitem) gobject_ = g_variant_type_copy(castitem); else - gobject_ = 0; + gobject_ = nullptr; return *this; } @@ -54,14 +54,14 @@ VariantType& VariantType::operator=(const GVariantType* castitem) VariantType VariantType::create_tuple(const std::vector<VariantType>& items) { typedef GVariantType* var_ptr; - var_ptr* const var_array = new var_ptr[items.size()]; + const auto var_array = new var_ptr[items.size()]; for(std::vector<VariantType>::size_type i = 0; i < items.size(); i++) { var_array[i] = const_cast<GVariantType*>(items[i].gobj()); } - VariantType result = Glib::wrap(g_variant_type_new_tuple(var_array, items.size())); + auto result = Glib::wrap(g_variant_type_new_tuple(var_array, items.size())); delete[] var_array; return result; } |