[pangomm] C++11: Use of auto.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] C++11: Use of auto.
- Date: Fri, 9 Dec 2016 12:52:51 +0000 (UTC)
commit 81826d64ad739041e4dd6386a787d1717fd8f915
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Dec 9 13:52:33 2016 +0100
C++11: Use of auto.
pango/src/attributes.ccg | 2 +-
pango/src/attriter.ccg | 4 ++--
pango/src/context.ccg | 2 +-
pango/src/item.ccg | 2 +-
pango/src/language.ccg | 2 +-
pango/src/layout.ccg | 4 ++--
pango/src/renderer.ccg | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/pango/src/attributes.ccg b/pango/src/attributes.ccg
index d457f07..9e42335 100644
--- a/pango/src/attributes.ccg
+++ b/pango/src/attributes.ccg
@@ -55,7 +55,7 @@ Attribute::~Attribute()
Attribute& Attribute::operator=(const Attribute& src)
{
- PangoAttribute *const new_gobject = (src.gobject_ ? pango_attribute_copy(src.gobject_) : nullptr);
+ auto* const new_gobject = (src.gobject_ ? pango_attribute_copy(src.gobject_) : nullptr);
if(gobject_)
pango_attribute_destroy(gobject_);
diff --git a/pango/src/attriter.ccg b/pango/src/attriter.ccg
index 7f32874..ef31152 100644
--- a/pango/src/attriter.ccg
+++ b/pango/src/attriter.ccg
@@ -54,7 +54,7 @@ AttrIter::~AttrIter()
AttrIter& AttrIter::operator=(const AttrIter& src)
{
- PangoAttrIterator *const new_gobject = (src.gobject_ ? pango_attr_iterator_copy(src.gobject_) : nullptr);
+ auto* const new_gobject = (src.gobject_ ? pango_attr_iterator_copy(src.gobject_) : nullptr);
if(gobject_)
pango_attr_iterator_destroy(gobject_);
@@ -131,7 +131,7 @@ SListHandle_Attribute AttrIter::get_extra_attrs() const
SListHandle_Attribute AttrIter::get_attrs() const
{
- GSList* attrs = pango_attr_iterator_get_attrs( const_cast<PangoAttrIterator*>(gobj()) );
+ auto attrs = pango_attr_iterator_get_attrs( const_cast<PangoAttrIterator*>(gobj()) );
return SListHandle_Attribute(attrs, Glib::OWNERSHIP_DEEP);
}
diff --git a/pango/src/context.ccg b/pango/src/context.ccg
index 3297d00..1f0922b 100644
--- a/pango/src/context.ccg
+++ b/pango/src/context.ccg
@@ -69,7 +69,7 @@ void Context::update_from_cairo_context(const Cairo::RefPtr<Cairo::Context>& con
Matrix Context::get_matrix() const
{
- const PangoMatrix* matrix = pango_context_get_matrix(const_cast<PangoContext*>(gobj()));
+ const auto* matrix = pango_context_get_matrix(const_cast<PangoContext*>(gobj()));
if(matrix)
return *matrix;
else
diff --git a/pango/src/item.ccg b/pango/src/item.ccg
index 40dba74..f057be1 100644
--- a/pango/src/item.ccg
+++ b/pango/src/item.ccg
@@ -63,7 +63,7 @@ Item::Item(PangoItem* castitem, bool make_a_copy)
Item& Item::operator=(const Item& src)
{
- PangoItem *const new_gobject = (src.gobject_) ? pango_item_copy(src.gobject_) : nullptr;
+ auto* const new_gobject = (src.gobject_) ? pango_item_copy(src.gobject_) : nullptr;
if(gobject_)
pango_item_free(gobject_);
diff --git a/pango/src/language.ccg b/pango/src/language.ccg
index 7f78f48..5e443fe 100644
--- a/pango/src/language.ccg
+++ b/pango/src/language.ccg
@@ -65,7 +65,7 @@ Glib::ustring Language::get_string() const
Glib::ArrayHandle<Script> Language::get_scripts() const
{
int num_scripts = 0;
- const PangoScript* carray = pango_language_get_scripts(const_cast<PangoLanguage*>(gobj()), &num_scripts);
+ const auto* carray = pango_language_get_scripts(const_cast<PangoLanguage*>(gobj()), &num_scripts);
return Glib::ArrayHandle<Script>((const Script*)carray, num_scripts, Glib::OWNERSHIP_NONE);
}
diff --git a/pango/src/layout.ccg b/pango/src/layout.ccg
index 70a5465..dd99deb 100644
--- a/pango/src/layout.ccg
+++ b/pango/src/layout.ccg
@@ -116,14 +116,14 @@ Rectangle Layout::get_pixel_logical_extents() const
void Layout::get_iter(LayoutIter& iter)
{
- PangoLayoutIter* cobject = pango_layout_get_iter(gobj());
+ auto* cobject = pango_layout_get_iter(gobj());
iter = Glib::wrap(cobject, false /* don't take_copy */);
}
_DEPRECATE_IFDEF_START
LayoutIter Layout::get_iter()
{
- PangoLayoutIter* cobject = pango_layout_get_iter(gobj());
+ auto* cobject = pango_layout_get_iter(gobj());
return Glib::wrap(cobject, false /* don't take_copy */);
}
_DEPRECATE_IFDEF_END
diff --git a/pango/src/renderer.ccg b/pango/src/renderer.ccg
index 66c2c33..8057555 100644
--- a/pango/src/renderer.ccg
+++ b/pango/src/renderer.ccg
@@ -28,7 +28,7 @@ namespace Pango
Matrix Renderer::get_matrix() const
{
- const PangoMatrix* matrix = pango_renderer_get_matrix(const_cast<PangoRenderer*>(gobj()));
+ const auto* matrix = pango_renderer_get_matrix(const_cast<PangoRenderer*>(gobj()));
if(matrix)
return *matrix;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]