[gtkmm] C++11: Yet more use of auto.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] C++11: Yet more use of auto.
- Date: Fri, 17 Mar 2017 20:02:33 +0000 (UTC)
commit 664aace9a8a66ca034e37b826311ccdb760fbb9d
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 17 17:17:40 2017 +0100
C++11: Yet more use of auto.
demos/gtk-demo/demowindow.cc | 12 +++++-----
demos/gtk-demo/example_appwindow.cc | 14 +++++-----
demos/gtk-demo/example_builder.cc | 6 ++--
demos/gtk-demo/example_buttonbox.cc | 4 +-
demos/gtk-demo/example_change_display.cc | 26 ++++++++++----------
demos/gtk-demo/example_drawingarea.cc | 4 +-
demos/gtk-demo/example_flowbox.cc | 6 ++--
demos/gtk-demo/example_headerbar.cc | 2 +-
demos/gtk-demo/example_iconbrowser.cc | 10 ++++----
demos/gtk-demo/example_images.cc | 6 ++--
demos/gtk-demo/example_menus.cc | 10 ++++----
demos/gtk-demo/example_pixbufs.cc | 2 +-
demos/gtk-demo/example_shortcuts.cc | 4 +-
demos/gtk-demo/example_sizegroup.cc | 6 ++--
demos/gtk-demo/example_stacksidebar.cc | 2 +-
demos/gtk-demo/example_textview.cc | 22 +++++++++---------
demos/gtk-demo/example_treeview_editable_cells.cc | 18 +++++++-------
demos/gtk-demo/example_treeview_liststore.cc | 2 +-
demos/gtk-demo/example_treeview_treestore.cc | 26 ++++++++++----------
demos/gtk-demo/main.cc | 2 +-
demos/gtk-demo/textwidget.cc | 4 +-
gtk/gtkmm/childpropertyproxy_base.cc | 2 +-
tests/builder/main.cc | 4 +-
tests/child_widget/main.cc | 2 +-
tests/child_widget2/main.cc | 2 +-
tests/child_widget_managed/main.cc | 2 +-
tests/delete_cpp_child/main.cc | 2 +-
tests/dialog/main.cc | 2 +-
tests/main_with_options/main.cc | 2 +-
tests/menu_destruction/main.cc | 2 +-
tests/property_notification/main.cc | 2 +-
tests/refcount_dialog/main.cc | 2 +-
tests/scrolledwindow/main.cc | 2 +-
tests/wrap_existing/main.cc | 4 +-
34 files changed, 109 insertions(+), 109 deletions(-)
---
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index 73dff25..0d2f810 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -138,10 +138,10 @@ void DemoWindow::fill_tree()
}
}
- Gtk::CellRendererText* pCell = Gtk::manage(new Gtk::CellRendererText());
+ auto pCell = Gtk::manage(new Gtk::CellRendererText());
pCell->property_style() = Pango::STYLE_ITALIC;
- Gtk::TreeViewColumn* pColumn = new Gtk::TreeViewColumn("Widget (double click for demo)", *pCell);
+ auto pColumn = new Gtk::TreeViewColumn("Widget (double click for demo)", *pCell);
pColumn->add_attribute(pCell->property_text(), columns.title);
pColumn->add_attribute(pCell->property_style_set(), columns.italic);
@@ -235,8 +235,8 @@ void DemoWindow::load_file(const std::string& filename)
m_TextWidget_Info.wipe();
m_TextWidget_Source.wipe();
- Glib::RefPtr<Gtk::TextBuffer> refBufferInfo = m_TextWidget_Info.get_buffer();
- Glib::RefPtr<Gtk::TextBuffer> refBufferSource = m_TextWidget_Source.get_buffer();
+ auto refBufferInfo = m_TextWidget_Info.get_buffer();
+ auto refBufferSource = m_TextWidget_Source.get_buffer();
Glib::RefPtr<const Glib::Bytes> bytes;
try
@@ -385,7 +385,7 @@ void DemoWindow::add_data_tabs(const std::string& filename)
{
const auto resource_name = resource_dir + "/" + resources[i];
Gtk::Widget* widget = nullptr;
- Gtk::Image* image = new Gtk::Image();
+ auto image = new Gtk::Image();
image->set_from_resource(resource_name);
if (image->get_pixbuf() || image->get_animation())
{
@@ -414,7 +414,7 @@ void DemoWindow::add_data_tabs(const std::string& filename)
{
// Looks like it parses as text. Dump it into a TextWidget then!
TextWidget* textwidget = new TextWidget(false);
- Glib::RefPtr<Gtk::TextBuffer> refBuffer = textwidget->get_buffer();
+ auto refBuffer = textwidget->get_buffer();
refBuffer->set_text(data, data + data_size);
widget = textwidget;
}
diff --git a/demos/gtk-demo/example_appwindow.cc b/demos/gtk-demo/example_appwindow.cc
index fb0366f..7af7032 100644
--- a/demos/gtk-demo/example_appwindow.cc
+++ b/demos/gtk-demo/example_appwindow.cc
@@ -46,7 +46,7 @@ Example_AppWindow::Example_AppWindow()
using namespace Gtk::Menu_Helpers;
//File menu:
- Gtk::Menu* pMenuFile = Gtk::manage( new Gtk::Menu() );
+ auto pMenuFile = Gtk::manage( new Gtk::Menu() );
MenuList& list_file = pMenuFile->items();
list_file.push_back( MenuElem("_New", "<control>N", sigc::mem_fun(*this,
&Example_AppWindow::on_menu_item)) );
list_file.push_back( MenuElem("_Open", "<control>O", sigc::mem_fun(*this,
&Example_AppWindow::on_menu_item)) );
@@ -56,11 +56,11 @@ Example_AppWindow::Example_AppWindow()
list_file.push_back( MenuElem("_Quit", "<control>Q", sigc::mem_fun(*this,
&Example_AppWindow::on_menu_item)) );
//Preferences menu:
- Gtk::Menu* pMenuPreferences = Gtk::manage( new Gtk::Menu() );
+ auto pMenuPreferences = Gtk::manage( new Gtk::Menu() );
MenuList& list_preferences = pMenuPreferences->items();
// Create a submenu
- Gtk::Menu* pMenuSub_Color = Gtk::manage( new Gtk::Menu());
+ auto pMenuSub_Color = Gtk::manage( new Gtk::Menu());
MenuList& list_sub = pMenuSub_Color->items();
list_sub.push_back( MenuElem("_Red", sigc::mem_fun(*this, &Example_AppWindow::on_menu_item)) );
list_sub.push_back( MenuElem("_Green", sigc::mem_fun(*this, &Example_AppWindow::on_menu_item)) );
@@ -69,7 +69,7 @@ Example_AppWindow::Example_AppWindow()
list_preferences.push_back( MenuElem("_Color", *pMenuSub_Color) );
// Create a submenu
- Gtk::Menu* pMenuSub_Shape = Gtk::manage( new Gtk::Menu());
+ auto pMenuSub_Shape = Gtk::manage( new Gtk::Menu());
list_sub = pMenuSub_Shape->items();
list_sub.push_back( MenuElem("_Square", sigc::mem_fun(*this, &Example_AppWindow::on_menu_item)) );
list_sub.push_back( MenuElem("_Rectangle", sigc::mem_fun(*this, &Example_AppWindow::on_menu_item)) );
@@ -78,7 +78,7 @@ Example_AppWindow::Example_AppWindow()
list_preferences.push_back( MenuElem("_Shape", *pMenuSub_Shape) );
//Help menu:
- Gtk::Menu* pMenuHelp = Gtk::manage( new Gtk::Menu() );
+ auto pMenuHelp = Gtk::manage( new Gtk::Menu() );
MenuList& list_help = pMenuHelp->items();
list_help.push_back( MenuElem("_About", sigc::mem_fun(*this, &Example_AppWindow::on_menu_item)) );
@@ -120,7 +120,7 @@ Example_AppWindow::Example_AppWindow()
m_Grid.attach(m_Statusbar, 0, 3, 1, 1);
/* Show text widget info in the statusbar */
- Glib::RefPtr<Gtk::TextBuffer> refTextBuffer = m_TextView.get_buffer();
+ auto refTextBuffer = m_TextView.get_buffer();
refTextBuffer->signal_changed().connect(sigc::mem_fun(*this, &Example_AppWindow::on_text_changed));
refTextBuffer->signal_mark_set().connect(sigc::mem_fun(*this, &Example_AppWindow::on_text_mark_set));
on_text_changed();
@@ -141,7 +141,7 @@ void Example_AppWindow::on_text_changed()
{
m_Statusbar.pop();
- Glib::RefPtr<Gtk::TextBuffer> refBuffer = m_TextView.get_buffer();
+ auto refBuffer = m_TextView.get_buffer();
gint count = refBuffer->get_char_count();
auto iter = refBuffer->get_iter_at_mark(refBuffer->get_insert());
diff --git a/demos/gtk-demo/example_builder.cc b/demos/gtk-demo/example_builder.cc
index 3eee4ce..72afb65 100644
--- a/demos/gtk-demo/example_builder.cc
+++ b/demos/gtk-demo/example_builder.cc
@@ -26,7 +26,7 @@ protected:
Gtk::Window* do_builder()
{
// Load the XML file and instantiate its widgets:
- Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create();
+ auto builder = Gtk::Builder::create();
try
{
builder->add_from_resource("/builder/example_builder.ui");
@@ -58,13 +58,13 @@ Example_Builder::Example_Builder(
if (pToolbar)
pToolbar->get_style_context()->add_class("primary-toolbar");
- Glib::RefPtr<Gio::SimpleActionGroup> refActions = Gio::SimpleActionGroup::create();
+ auto refActions = Gio::SimpleActionGroup::create();
refActions->add_action("quit", sigc::mem_fun(*this, &Example_Builder::on_file_quit));
refActions->add_action("about", sigc::mem_fun(*this, &Example_Builder::on_help_about));
refActions->add_action("help", sigc::mem_fun(*this, &Example_Builder::on_help_help));
insert_action_group("win", refActions);
- Glib::RefPtr<Gtk::AccelGroup> refAccelGroup = Gtk::AccelGroup::create();
+ auto refAccelGroup = Gtk::AccelGroup::create();
add_accel_group(refAccelGroup);
Gtk::MenuItem* pMenuItem = nullptr;
diff --git a/demos/gtk-demo/example_buttonbox.cc b/demos/gtk-demo/example_buttonbox.cc
index 6e401db..7471d41 100644
--- a/demos/gtk-demo/example_buttonbox.cc
+++ b/demos/gtk-demo/example_buttonbox.cc
@@ -69,7 +69,7 @@ Example_ButtonBox::~Example_ButtonBox()
Gtk::Frame* Example_ButtonBox::create_button_box(bool horizontal, const Glib::ustring& title, gint spacing,
Gtk::ButtonBoxStyle layout)
{
- Gtk::Frame* pFrame = Gtk::manage(new Gtk::Frame(title));
+ auto pFrame = Gtk::manage(new Gtk::Frame(title));
Gtk::ButtonBox* pButtonBox = nullptr;
if (horizontal)
@@ -87,7 +87,7 @@ Gtk::Frame* Example_ButtonBox::create_button_box(bool horizontal, const Glib::us
pButtonBox->set_layout(layout);
pButtonBox->set_spacing(spacing);
- Gtk::Button* pButton = Gtk::manage(new Gtk::Button("_OK", true));
+ auto pButton = Gtk::manage(new Gtk::Button("_OK", true));
pButtonBox->add(*pButton);
pButton = Gtk::manage(new Gtk::Button("_Cancel", true));
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 77299bd..2ab7a99 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -130,7 +130,7 @@ Example_ChangeDisplay::Example_ChangeDisplay()
m_TreeView_Display.append_column("Name", m_columns_display.m_name);
//Connect signal:
- Glib::RefPtr<Gtk::TreeView::Selection> refSelection = m_TreeView_Display.get_selection();
+ auto refSelection = m_TreeView_Display.get_selection();
refSelection->signal_changed().connect( sigc::mem_fun(*this,
&Example_ChangeDisplay::on_treeview_display_selection_changed) );
m_VBox.pack_start(m_Frame_Display);
@@ -153,11 +153,11 @@ Example_ChangeDisplay::~Example_ChangeDisplay()
void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treeview, Gtk::Box& buttonbox)
{
- Gtk::Box* pHBox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8) );
+ auto pHBox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8) );
pHBox->property_margin() = 8;
frame.add(*pHBox);
- Gtk::ScrolledWindow* pScrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
+ auto pScrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
pScrolledWindow->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
pScrolledWindow->set_shadow_type(Gtk::SHADOW_IN);
pHBox->pack_start(*pScrolledWindow);
@@ -165,7 +165,7 @@ void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treevi
treeview.set_headers_visible(false);
pScrolledWindow->add(treeview);
- Glib::RefPtr<Gtk::TreeView::Selection> refSelection = treeview.get_selection();
+ auto refSelection = treeview.get_selection();
refSelection->set_mode(Gtk::SELECTION_BROWSE);
pHBox->pack_start(buttonbox, Gtk::PACK_SHRINK);
@@ -175,7 +175,7 @@ void Example_ChangeDisplay::initialize_displays()
{
#ifndef G_OS_WIN32
- Glib::RefPtr<Gdk::DisplayManager> refDisplayManager = Gdk::DisplayManager::get();
+ auto refDisplayManager = Gdk::DisplayManager::get();
for(auto refDisplay : refDisplayManager->list_displays())
{
@@ -195,7 +195,7 @@ void Example_ChangeDisplay::on_display_closed(bool /* is_error */, Glib::RefPtr<
auto children = m_refListStore_Display->children();
for (auto iter = children.begin(); iter != children.end(); ++iter)
{
- Glib::RefPtr<Gdk::Display> refDisplay = (*iter)[m_columns_display.m_display];
+ const Glib::RefPtr<Gdk::Display> refDisplay = (*iter)[m_columns_display.m_display];
if (refDisplay == display)
{
m_refListStore_Display->erase(iter);
@@ -249,7 +249,7 @@ void Example_ChangeDisplay::on_button_display_close()
void Example_ChangeDisplay::on_treeview_display_selection_changed()
{
- Glib::RefPtr<Gtk::TreeSelection> refSelection = m_TreeView_Display.get_selection();
+ auto refSelection = m_TreeView_Display.get_selection();
auto iter = refSelection->get_selected();
if(iter)
m_refCurrentDisplay = (*iter)[m_columns_display.m_display];
@@ -263,8 +263,8 @@ void Example_ChangeDisplay::on_treeview_display_selection_changed()
*/
void Example_ChangeDisplay::query_change_display()
{
- Glib::RefPtr<Gdk::Screen> refScreen = get_screen();
- Gtk::Window* pTopLevel = query_for_toplevel(refScreen,
+ auto refScreen = get_screen();
+ auto pTopLevel = query_for_toplevel(refScreen,
"Please select the toplevel\n"
"to move to the new screen");
@@ -291,7 +291,7 @@ void Example_ChangeDisplay::on_response(int response_id)
*/
Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::Screen>& screen, const
Glib::ustring& prompt)
{
- Glib::RefPtr<Gdk::Display> refDisplay = screen->get_display();
+ auto refDisplay = screen->get_display();
if(m_pPopup)
{
@@ -303,7 +303,7 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
m_pPopup->show();
- Glib::RefPtr<Gdk::Cursor> cursor = Gdk::Cursor::create(refDisplay, Gdk::CROSSHAIR);
+ auto cursor = Gdk::Cursor::create(refDisplay, Gdk::CROSSHAIR);
Gtk::Window* toplevel = nullptr;
@@ -339,7 +339,7 @@ Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<
//TODO: This needs to use Device::get_window_at_position(), when we can figure that out.
//See https://bugzilla.gnome.org/show_bug.cgi?id=638907
/*
- Glib::RefPtr<Gdk::Window> refPointerWindow = display->get_window_at_pointer();
+ auto refPointerWindow = display->get_window_at_pointer();
if (refPointerWindow)
{
@@ -350,7 +350,7 @@ Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<
refPointerWindow->get_user_data(user_data);
cWidget = (GtkWidget*)user_data;
- Gtk::Widget* pWidget = Glib::wrap(cWidget);
+ auto pWidget = Glib::wrap(cWidget);
if(pWidget)
return pWidget->get_toplevel();
}
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index 95f0543..ba06d2e 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -195,14 +195,14 @@ bool Example_DrawingArea::on_drawingarea_scribble_motion_notify_event(GdkEventMo
*/
if(motion_event && motion_event->window)
{
- const Glib::RefPtr<Gdk::Window> refWindow =
+ const auto refWindow =
Glib::wrap(motion_event->window, true); // true == take_copy
if(refWindow)
{
int x = 0, y = 0;
auto state = Gdk::ModifierType(0);
- const Glib::RefPtr<const Gdk::Device> device =
+ const auto device =
Glib::wrap(motion_event->device, true); // true == take_copy
refWindow->get_device_position(device, x, y, state);
diff --git a/demos/gtk-demo/example_flowbox.cc b/demos/gtk-demo/example_flowbox.cc
index ef33b31..88d85a4 100644
--- a/demos/gtk-demo/example_flowbox.cc
+++ b/demos/gtk-demo/example_flowbox.cc
@@ -55,7 +55,7 @@ Example_FlowBox::Example_FlowBox()
fill_color_names();
for(std::size_t i = 0; i != m_color_names.size(); ++i)
{
- Gtk::Button* color_swatch = create_color_swatch(i);
+ auto color_swatch = create_color_swatch(i);
m_flow_box.add(*color_swatch);
}
@@ -70,8 +70,8 @@ Example_FlowBox::~Example_FlowBox()
Gtk::Button* Example_FlowBox::create_color_swatch(int swatch_i)
{
- Gtk::DrawingArea* drawing_area = Gtk::manage(new Gtk::DrawingArea());
- Gtk::Button* color_swatch = Gtk::manage(new Gtk::Button());
+ auto drawing_area = Gtk::manage(new Gtk::DrawingArea());
+ auto color_swatch = Gtk::manage(new Gtk::Button());
drawing_area->set_content_width(24);
drawing_area->set_content_height(24);
diff --git a/demos/gtk-demo/example_headerbar.cc b/demos/gtk-demo/example_headerbar.cc
index 50d1217..da6d2a6 100644
--- a/demos/gtk-demo/example_headerbar.cc
+++ b/demos/gtk-demo/example_headerbar.cc
@@ -80,7 +80,7 @@ void Example_HeaderBar::configure_send_receive_button()
/* the 'const' is required, to avoid C2668/Ambiguous call errors
on some compilers, such as Visual Studio or when compiling without
GTKMM_DISABLE_DEPRECATED on g++ */
- Glib::RefPtr<const Gio::Icon> icon = Gio::ThemedIcon::create("mail-send-receive-symbolic", false);
+ auto icon = Gio::ThemedIcon::create("mail-send-receive-symbolic", false);
m_send_receive_image.set(icon, Gtk::ICON_SIZE_BUTTON);
m_send_receive_button.add(m_send_receive_image);
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 964d53e..095a998 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -287,12 +287,12 @@ void Example_IconBrowser::on_symbolic_radio_toggled()
void Example_IconBrowser::on_context_list_selected_rows_changed()
{
- Gtk::ListBoxRow* row = m_context_list.get_selected_row();
+ auto row = m_context_list.get_selected_row();
if (!row)
return;
m_search_button.set_active(false);
- Gtk::Widget* rowchild = row->get_child();
+ auto rowchild = row->get_child();
IconContextLabel* label = dynamic_cast<IconContextLabel*>(rowchild);
if (label)
{
@@ -835,7 +835,7 @@ void Example_IconBrowser::add_context(const Glib::ustring& id,
m_context_list.append(*row);
// Set the tooltip on the list box row.
- Gtk::Container* listboxrow = row->get_parent();
+ auto listboxrow = row->get_parent();
listboxrow->set_tooltip_text(description);
if (m_current_context_id.empty())
@@ -894,7 +894,7 @@ DetailDialog::DetailDialog(Gtk::Window& parent)
: Gtk::Dialog("", parent, true, true)
{
set_resizable(false);
- Gtk::Box* content_area = get_content_area();
+ auto content_area = get_content_area();
content_area->pack_start(m_grid);
m_grid.property_margin() = 10;
m_grid.set_row_spacing(10);
@@ -961,7 +961,7 @@ void DetailDialog::on_image_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&
Glib::RefPtr<Gdk::Pixbuf> DetailDialog::get_icon(int size_index)
{
- Glib::RefPtr<Gtk::StyleContext> context = m_image[size_index].get_style_context();
+ auto context = m_image[size_index].get_style_context();
auto info = Gtk::IconTheme::get_default()->lookup_icon(
m_icon_name, m_icon_size[size_index]);
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index c19173f..377d54f 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -65,7 +65,7 @@ Example_Images::Example_Images()
m_Frame_Image.set_valign(Gtk::ALIGN_CENTER);
m_VBox.pack_start(m_Frame_Image, Gtk::PACK_SHRINK);
- Gtk::Image* pImage = Gtk::manage(new Gtk::Image());
+ auto pImage = Gtk::manage(new Gtk::Image());
pImage->set_from_resource("/images/gtk-logo-rgb.gif");
m_Frame_Image.add(*pImage);
@@ -233,7 +233,7 @@ bool Example_Images::on_timeout()
void Example_Images::on_loader_area_prepared()
{
- const Glib::RefPtr<Gdk::Pixbuf> refPixbuf = m_refPixbufLoader->get_pixbuf();
+ const auto refPixbuf = m_refPixbufLoader->get_pixbuf();
/* Avoid displaying random memory contents, since the pixbuf
* isn't filled in yet.
@@ -254,7 +254,7 @@ void Example_Images::on_loader_area_updated(int/*x*/, int/*y*/, int/*width*/, in
* position of the pixbuf on the display, then we could queue a draw
* for only the updated area of the image.
*/
- Glib::RefPtr<Gdk::Pixbuf> refPixbuf = m_Image_Progressive.get_pixbuf();
+ auto refPixbuf = m_Image_Progressive.get_pixbuf();
m_Image_Progressive.set(refPixbuf);
}
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index 61fb7d2..51620e2 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -67,7 +67,7 @@ Example_Menus::Example_Menus()
{
//Note:: It's generally easier to use the Gtk::Builder API.
- Gtk::MenuItem* pMenuItem = Gtk::manage(new Gtk::MenuItem("test\nline2"));
+ auto pMenuItem = Gtk::manage(new Gtk::MenuItem("test\nline2"));
pMenuItem->set_submenu( *(create_menu(2)) );
m_MenuBar.append(*pMenuItem);
pMenuItem->show();
@@ -88,7 +88,7 @@ Example_Menus::Example_Menus()
m_VBox1.pack_start(m_VBox_Sub1);
{
- Gtk::Menu* pMenu = create_menu(1);
+ auto pMenu = create_menu(1);
pMenu->set_accel_group(get_accel_group());
Gtk::MenuItem* pMenuItem = Gtk::manage(new Gtk::SeparatorMenuItem());
@@ -133,7 +133,7 @@ Gtk::Menu* Example_Menus::create_menu(gint depth)
if (depth < 1)
return nullptr;
- Gtk::Menu* pMenu = Gtk::manage(new Gtk::Menu());
+ auto pMenu = Gtk::manage(new Gtk::Menu());
{
Gtk::RadioMenuItem::Group radiogroup;
@@ -143,14 +143,14 @@ Gtk::Menu* Example_Menus::create_menu(gint depth)
char buf[32];
sprintf(buf, "item %2d - %d", depth, j);
- Gtk::MenuItem* pMenuItem = Gtk::manage(new Gtk::RadioMenuItem(radiogroup, buf));
+ auto pMenuItem = Gtk::manage(new Gtk::RadioMenuItem(radiogroup, buf));
pMenu->append(*pMenuItem);
pMenuItem->show();
if(i == 3)
pMenuItem->set_sensitive(false);
- Gtk::Menu* pSubMenu = create_menu(depth - 1);
+ auto pSubMenu = create_menu(depth - 1);
if(pSubMenu)
pMenuItem->set_submenu(*pSubMenu);
}
diff --git a/demos/gtk-demo/example_pixbufs.cc b/demos/gtk-demo/example_pixbufs.cc
index d2c3fef..f3a5685 100644
--- a/demos/gtk-demo/example_pixbufs.cc
+++ b/demos/gtk-demo/example_pixbufs.cc
@@ -122,7 +122,7 @@ void Example_Pixbufs::load_pixbufs()
{
auto resource_name = std::string("/pixbufs/") + image_names[i];
- Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_resource(resource_name);
+ auto pixbuf = Gdk::Pixbuf::create_from_resource(resource_name);
m_images[i] = pixbuf;
}
diff --git a/demos/gtk-demo/example_shortcuts.cc b/demos/gtk-demo/example_shortcuts.cc
index e73008c..37e593c 100644
--- a/demos/gtk-demo/example_shortcuts.cc
+++ b/demos/gtk-demo/example_shortcuts.cc
@@ -26,7 +26,7 @@ protected:
Gtk::Window* do_shortcuts()
{
// Load the XML file and instantiate its widgets:
- Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create();
+ auto builder = Gtk::Builder::create();
try
{
builder->add_from_resource("/shortcuts/example_shortcuts.ui");
@@ -102,7 +102,7 @@ Example_Shortcuts::~Example_Shortcuts()
void Example_Shortcuts::on_button_clicked(const Glib::ustring& id, const Glib::ustring& view)
{
- Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create();
+ auto builder = Gtk::Builder::create();
try
{
builder->add_from_resource("/shortcuts/example_" + id + ".ui");
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index c4515f6..8598659 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -131,12 +131,12 @@ void Example_SizeGroup::add_row(Gtk::Grid& grid, int row,
const Glib::ustring& label_text,
const std::list<Glib::ustring>& options)
{
- Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(label_text, Gtk::ALIGN_START, Gtk::ALIGN_END, true));
+ auto pLabel = Gtk::manage(new Gtk::Label(label_text, Gtk::ALIGN_START, Gtk::ALIGN_END, true));
grid.attach(*pLabel, 0, row, 1, 1);
pLabel->set_hexpand();
- Gtk::ComboBoxText* pComboBoxText = create_combobox(options);
+ auto pComboBoxText = create_combobox(options);
pLabel->set_mnemonic_widget(*pComboBoxText);
size_group->add_widget(*pComboBoxText);
@@ -147,7 +147,7 @@ void Example_SizeGroup::add_row(Gtk::Grid& grid, int row,
*/
Gtk::ComboBoxText* Example_SizeGroup::create_combobox(const std::list<Glib::ustring>& strings)
{
- Gtk::ComboBoxText* pCombo = Gtk::manage( new Gtk::ComboBoxText() );
+ auto pCombo = Gtk::manage( new Gtk::ComboBoxText() );
for(const auto& str : strings)
{
diff --git a/demos/gtk-demo/example_stacksidebar.cc b/demos/gtk-demo/example_stacksidebar.cc
index 7c642e2..3a50396 100644
--- a/demos/gtk-demo/example_stacksidebar.cc
+++ b/demos/gtk-demo/example_stacksidebar.cc
@@ -64,7 +64,7 @@ Example_StackSidebar::Example_StackSidebar()
Gtk::Widget* widget = nullptr;
if (i == 0)
{
- Gtk::Image* image = Gtk::manage(new Gtk::Image());
+ auto image = Gtk::manage(new Gtk::Image());
image->set_from_icon_name("help-about", Gtk::ICON_SIZE_MENU);
image->set_pixel_size(256);
widget = image;
diff --git a/demos/gtk-demo/example_textview.cc b/demos/gtk-demo/example_textview.cc
index 8652446..af37dbd 100644
--- a/demos/gtk-demo/example_textview.cc
+++ b/demos/gtk-demo/example_textview.cc
@@ -75,7 +75,7 @@ Example_TextView::Example_TextView()
* by itself with refBuffer->new(), then later create
* a view widget.
*/
- Glib::RefPtr<Gtk::TextBuffer> refBuffer = m_View1.get_buffer();
+ auto refBuffer = m_View1.get_buffer();
m_pView2 = Gtk::manage( new Gtk::TextView(refBuffer) );
m_ScrolledWindow1.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -172,7 +172,7 @@ void Example_TextView::insert_text(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
try
{
refPixbuf = Gdk::Pixbuf::create_from_resource("/textview/gtk-logo-rgb.gif");
- Glib::RefPtr<Gdk::Pixbuf> refScaled = refPixbuf->scale_simple(32, 32, Gdk::INTERP_BILINEAR);
+ auto refScaled = refPixbuf->scale_simple(32, 32, Gdk::INTERP_BILINEAR);
refPixbuf = refScaled;
}
catch (const Glib::Error& error)
@@ -340,7 +340,7 @@ void Example_TextView::insert_text(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
iter = refBuffer->insert(iter, "You can put widgets in the buffer: Here's a button: ");
- Glib::RefPtr<Gtk::TextChildAnchor> refAnchor = refBuffer->create_child_anchor(iter);
+ auto refAnchor = refBuffer->create_child_anchor(iter);
iter = refBuffer->insert(refBuffer->end(), " and a menu: ");
refAnchor = refBuffer->create_child_anchor(iter); //TODO: Maybe this should be a method of the Iterator.
iter = refBuffer->insert(refBuffer->end(), " and a scale: ");
@@ -381,17 +381,17 @@ void Example_TextView::attach_widgets(Gtk::TextView& text_view)
int i = 0;
while(find_anchor(iter)) //previously created with create_child_anchor().
{
- Glib::RefPtr<Gtk::TextChildAnchor> refAnchor = iter.get_child_anchor();
+ auto refAnchor = iter.get_child_anchor();
Gtk::Widget* pWidget = nullptr;
if (i == 0)
{
- Gtk::Button* pButton = Gtk::manage( new Gtk::Button("Click Me") );
+ auto pButton = Gtk::manage( new Gtk::Button("Click Me") );
pButton->signal_clicked().connect(sigc::mem_fun(*this, &Example_TextView::on_button_clicked));
pWidget = pButton;
}
else if (i == 1)
{
- Gtk::ComboBoxText* pCombo = Gtk::manage( new Gtk::ComboBoxText() );
+ auto pCombo = Gtk::manage( new Gtk::ComboBoxText() );
pCombo->append("Option 1");
pCombo->append("Option 2");
pCombo->append("Option 3");
@@ -400,7 +400,7 @@ void Example_TextView::attach_widgets(Gtk::TextView& text_view)
}
else if (i == 2)
{
- Gtk::Scale* pHScale = Gtk::manage( new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL) );
+ auto pHScale = Gtk::manage( new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL) );
pHScale->set_range(0, 100);
pHScale->set_size_request(70, -1);
@@ -408,7 +408,7 @@ void Example_TextView::attach_widgets(Gtk::TextView& text_view)
}
else if (i == 3)
{
- Gtk::Image* pImage = Gtk::manage( new Gtk::Image() );
+ auto pImage = Gtk::manage( new Gtk::Image() );
pImage->set_from_resource("/textview/floppybuddy.gif");
pWidget = pImage;
}
@@ -444,7 +444,7 @@ Window_EasterEgg::Window_EasterEgg()
auto iter = refBuffer->end();
iter = refBuffer->insert(iter, "This buffer is shared by a set of nested text views.\n Nested view:\n");
- Glib::RefPtr<Gtk::TextChildAnchor> refAnchor = refBuffer->create_child_anchor(iter);
+ auto refAnchor = refBuffer->create_child_anchor(iter);
refBuffer->insert(refBuffer->end(), "\nDon't do this in real applications, please.\n");
m_pTextView = Gtk::manage( new Gtk::TextView(refBuffer) );
@@ -467,10 +467,10 @@ void Window_EasterEgg::recursive_attach_view(int depth, Gtk::TextView& view, Gli
if (depth > 4)
return;
- Gtk::TextView* pChildView = Gtk::manage( new Gtk::TextView(view.get_buffer()));
+ auto pChildView = Gtk::manage( new Gtk::TextView(view.get_buffer()));
/* Frame is to add a black border around each child view */
- Gtk::Frame* pFrame = Gtk::manage( new Gtk::Frame());
+ auto pFrame = Gtk::manage( new Gtk::Frame());
pFrame->add(*pChildView);
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc
b/demos/gtk-demo/example_treeview_editable_cells.cc
index 285363e..8e27f83 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -119,7 +119,7 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
/* create tree view */
m_TreeView.set_model(m_refListStore);
- Glib::RefPtr<Gtk::TreeSelection> refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_TreeView.get_selection();
refTreeSelection->set_mode(Gtk::SELECTION_SINGLE);
add_columns();
@@ -223,7 +223,7 @@ void Example_TreeView_EditableCells::on_column_product_edited(const Glib::ustrin
Gtk::TreePath path(path_string);
//Get the row from the path:
- Glib::RefPtr<Gtk::TreeModel> refModel = m_TreeView.get_model();
+ auto refModel = m_TreeView.get_model();
if(refModel)
{
auto iter = refModel->get_iter(path);
@@ -247,11 +247,11 @@ void Example_TreeView_EditableCells::add_columns()
//And this is the way that works with the IRIX MipsPro compiler too:
{
- Gtk::TreeView::Column* pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Number", m_columns.number));
+ auto pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Number", m_columns.number));
//connect signal handlers for auto-storing of edited cell data
- Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell();
- Gtk::CellRendererText* pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
+ auto pCellRenderer = pViewColumn->get_first_cell();
+ auto pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
if(pCellRenderText)
{
//Set the appropriate property,
@@ -265,11 +265,11 @@ void Example_TreeView_EditableCells::add_columns()
}
{
- Gtk::TreeView::Column* pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Product",
m_columns.product));
+ auto pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Product", m_columns.product));
//connect signal handlers for auto-storing of edited cell data
- Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell();
- Gtk::CellRendererText* pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
+ auto pCellRenderer = pViewColumn->get_first_cell();
+ auto pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
if(pCellRenderText)
{
//Set the appropriate property,
@@ -298,7 +298,7 @@ void Example_TreeView_EditableCells::on_button_add_clicked()
void Example_TreeView_EditableCells::on_button_remove_clicked()
{
- Glib::RefPtr<Gtk::TreeSelection> refSelection = m_TreeView.get_selection();
+ auto refSelection = m_TreeView.get_selection();
if(const auto iter = refSelection->get_selected())
{
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index a9f1c38..d09f018 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -172,7 +172,7 @@ void Example_TreeView_ListStore::add_columns()
/* column for fixed toggles */
{
int cols_count = m_TreeView.append_column_editable("Fixed?", m_columns.fixed);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
/* set this column to a fixed sizing (of 50 pixels) */
pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index 29b0ebf..a932638 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -164,7 +164,7 @@ Example_TreeView_TreeStore::Example_TreeView_TreeStore()
/* create tree view */
m_TreeView.set_model(m_refTreeStore);
- Glib::RefPtr<Gtk::TreeSelection> refTreeSelection = m_TreeView.get_selection();
+ auto refTreeSelection = m_TreeView.get_selection();
refTreeSelection->set_mode(Gtk::SELECTION_MULTIPLE);
@@ -319,10 +319,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for holiday names */
{
int cols_count = m_TreeView.append_column("Holiday", m_columns.holiday_name);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRenderer* pRenderer = pColumn->get_first_cell();
+ auto pRenderer = pColumn->get_first_cell();
pRenderer->property_xalign().set_value(0.0);
pColumn->set_clickable();
@@ -332,10 +332,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for Alex */
{
int cols_count = m_TreeView.append_column_editable("Alex", m_columns.alex);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
+ auto pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
pRenderer->property_xalign().set_value(0.0);
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
@@ -350,10 +350,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for Havoc */
{
int cols_count = m_TreeView.append_column_editable("Havoc", m_columns.havoc);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
+ auto pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
pRenderer->property_xalign().set_value(0.0);
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
@@ -367,10 +367,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for Tim */
{
int cols_count = m_TreeView.append_column_editable("Tim", m_columns.tim);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
+ auto pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
pRenderer->property_xalign().set_value(0.0);
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
@@ -385,10 +385,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for Owen */
{
int cols_count = m_TreeView.append_column_editable("Owen", m_columns.owen);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
+ auto pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
pRenderer->property_xalign().set_value(0.0);
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
@@ -402,10 +402,10 @@ void Example_TreeView_TreeStore::add_columns()
/* column for Dave */
{
int cols_count = m_TreeView.append_column("Dave", m_columns.dave);
- Gtk::TreeViewColumn* pColumn = m_TreeView.get_column(cols_count-1);
+ auto pColumn = m_TreeView.get_column(cols_count-1);
if(pColumn)
{
- Gtk::CellRendererToggle* pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
+ auto pRenderer = static_cast<Gtk::CellRendererToggle*>(pColumn->get_first_cell());
pRenderer->property_xalign().set_value(0.0);
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
diff --git a/demos/gtk-demo/main.cc b/demos/gtk-demo/main.cc
index 39d938e..83695ba 100644
--- a/demos/gtk-demo/main.cc
+++ b/demos/gtk-demo/main.cc
@@ -22,7 +22,7 @@
int main (int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
DemoWindow window;
diff --git a/demos/gtk-demo/textwidget.cc b/demos/gtk-demo/textwidget.cc
index c1ab9e5..03ee505 100644
--- a/demos/gtk-demo/textwidget.cc
+++ b/demos/gtk-demo/textwidget.cc
@@ -41,7 +41,7 @@ TextWidget::TextWidget(bool is_source)
{
m_TextView.set_wrap_mode (Gtk::WRAP_NONE);
- Glib::RefPtr<Gtk::TextBuffer::Tag> refTag = m_refTextBuffer->create_tag("source");
+ auto refTag = m_refTextBuffer->create_tag("source");
refTag->property_font() = "Courier 12";
refTag = m_refTextBuffer->create_tag("comment");
@@ -74,7 +74,7 @@ TextWidget::TextWidget(bool is_source)
m_TextView.set_pixels_above_lines(2);
m_TextView.set_pixels_below_lines(2);
- Glib::RefPtr<Gtk::TextBuffer::Tag> refTag = m_refTextBuffer->create_tag("title");
+ auto refTag = m_refTextBuffer->create_tag("title");
refTag->property_font() = "Sans 18";
}
}
diff --git a/gtk/gtkmm/childpropertyproxy_base.cc b/gtk/gtkmm/childpropertyproxy_base.cc
index 7783b58..1376fc7 100644
--- a/gtk/gtkmm/childpropertyproxy_base.cc
+++ b/gtk/gtkmm/childpropertyproxy_base.cc
@@ -29,7 +29,7 @@ sigc::connection SignalProxyChildProperty::connect(const SlotType& sl)
{
// Create a proxy to hold our connection info
// This will be deleted by destroy_notify_handler.
- Glib::PropertyProxyConnectionNode* pConnectionNode = new Glib::PropertyProxyConnectionNode(sl,
obj_->gobj());
+ auto pConnectionNode = new Glib::PropertyProxyConnectionNode(sl, obj_->gobj());
// connect it to gtk+
// pConnectionNode will be passed as the data argument to the callback.
diff --git a/tests/builder/main.cc b/tests/builder/main.cc
index 7ff695b..0ff8c2f 100644
--- a/tests/builder/main.cc
+++ b/tests/builder/main.cc
@@ -150,9 +150,9 @@ int main(int argc, char* argv[])
argc1 = 1; // Don't give the command line arguments to Gtk::Application.
}
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
- Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create_from_string(gladefile);
+ auto builder = Gtk::Builder::create_from_string(gladefile);
MainWindow* main_win = nullptr;
builder->get_widget_derived("main_window", main_win);
diff --git a/tests/child_widget/main.cc b/tests/child_widget/main.cc
index 03c9b32..c4cc804 100644
--- a/tests/child_widget/main.cc
+++ b/tests/child_widget/main.cc
@@ -19,7 +19,7 @@
int main(int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
TestWindow testWindow;
return app->run(testWindow, argc, argv); //Shows the window and returns when it is closed.
diff --git a/tests/child_widget2/main.cc b/tests/child_widget2/main.cc
index 768a59a..4cd0f1b 100644
--- a/tests/child_widget2/main.cc
+++ b/tests/child_widget2/main.cc
@@ -19,7 +19,7 @@ MyWindow::MyWindow() :
int main (int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
MyWindow window;
return app->run(window, argc, argv);
diff --git a/tests/child_widget_managed/main.cc b/tests/child_widget_managed/main.cc
index 037aa45..bd81aca 100644
--- a/tests/child_widget_managed/main.cc
+++ b/tests/child_widget_managed/main.cc
@@ -43,7 +43,7 @@ ExampleWindow::~ExampleWindow()
int main(int argc, char* argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
ExampleWindow window;
return app->run(window, argc, argv);
diff --git a/tests/delete_cpp_child/main.cc b/tests/delete_cpp_child/main.cc
index bafae55..fae91f9 100644
--- a/tests/delete_cpp_child/main.cc
+++ b/tests/delete_cpp_child/main.cc
@@ -48,7 +48,7 @@ void AppWindow::on_button_clicked()
int main(int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
AppWindow window;
return app->run(window, argc, argv);
}
diff --git a/tests/dialog/main.cc b/tests/dialog/main.cc
index 137abd9..20b09d3 100644
--- a/tests/dialog/main.cc
+++ b/tests/dialog/main.cc
@@ -48,7 +48,7 @@ void AppWindow::on_button_clicked()
int main(int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
AppWindow window;
return app->run(window, argc, argv);
}
diff --git a/tests/main_with_options/main.cc b/tests/main_with_options/main.cc
index ac8e209..e0fe769 100644
--- a/tests/main_with_options/main.cc
+++ b/tests/main_with_options/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
try
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
//Here we can see the parsed values of our custom command-line arguments:
diff --git a/tests/menu_destruction/main.cc b/tests/menu_destruction/main.cc
index 41bc5ba..60e91c3 100644
--- a/tests/menu_destruction/main.cc
+++ b/tests/menu_destruction/main.cc
@@ -76,7 +76,7 @@ test_window::test_window()
int main(int argc, char *argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
test_window foo;
return app->run(foo, argc, argv);
}
diff --git a/tests/property_notification/main.cc b/tests/property_notification/main.cc
index afde633..b67cc11 100644
--- a/tests/property_notification/main.cc
+++ b/tests/property_notification/main.cc
@@ -19,7 +19,7 @@ void on_property_name_changed()
int main (int argc, char **argv)
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
Gtk::Window window;
diff --git a/tests/refcount_dialog/main.cc b/tests/refcount_dialog/main.cc
index 1d0c3d8..adc1ce9 100644
--- a/tests/refcount_dialog/main.cc
+++ b/tests/refcount_dialog/main.cc
@@ -52,7 +52,7 @@ void MyWindow::on_button_clicked()
int main(int argc, char* argv[])
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
MyWindow win;
return app->run(win, argc, argv);
diff --git a/tests/scrolledwindow/main.cc b/tests/scrolledwindow/main.cc
index 1428d0c..4462a37 100644
--- a/tests/scrolledwindow/main.cc
+++ b/tests/scrolledwindow/main.cc
@@ -57,7 +57,7 @@ protected:
int main (int /* argc */, char** /* argv */)
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
Instance instance;
diff --git a/tests/wrap_existing/main.cc b/tests/wrap_existing/main.cc
index 21c34b9..1a1482a 100644
--- a/tests/wrap_existing/main.cc
+++ b/tests/wrap_existing/main.cc
@@ -20,9 +20,9 @@ void on_object_qdata_destroyed(gpointer data)
int main (int /* argc */, char** /* argv */)
{
- Glib::RefPtr<Gtk::Application> app = Gtk::Application::create();
+ auto app = Gtk::Application::create();
- Gtk::Dialog* pDialog = new Gtk::Dialog();
+ auto pDialog = new Gtk::Dialog();
Gtk::Box* pBox = pDialog->get_content_area();
//Set a quark and a callback:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
