From 22b07e0233a29d9633ffa825a79503befaf2e16e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 5 Oct 2015 16:17:49 +0200 Subject: NOOP, remove trailing tabs/whitespace. --- libs/gtkmm2ext/actions.cc | 12 +-- libs/gtkmm2ext/binding_proxy.cc | 6 +- libs/gtkmm2ext/cairo_packer.cc | 4 +- libs/gtkmm2ext/cairo_widget.cc | 12 +-- libs/gtkmm2ext/cairocell.cc | 20 ++--- libs/gtkmm2ext/cell_renderer_color_selector.cc | 12 +-- libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc | 2 +- libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc | 2 +- libs/gtkmm2ext/choice.cc | 4 +- libs/gtkmm2ext/click_box.cc | 10 +-- libs/gtkmm2ext/dndtreeview.cc | 4 +- libs/gtkmm2ext/fader.cc | 28 +++---- libs/gtkmm2ext/grouped_buttons.cc | 4 +- libs/gtkmm2ext/gtk_ui.cc | 10 +-- libs/gtkmm2ext/gtkmm2ext/actions.h | 2 +- libs/gtkmm2ext/gtkmm2ext/auto_spin.h | 2 +- libs/gtkmm2ext/gtkmm2ext/barcontroller.h | 2 +- libs/gtkmm2ext/gtkmm2ext/bindable_button.h | 6 +- libs/gtkmm2ext/gtkmm2ext/binding_proxy.h | 6 +- libs/gtkmm2ext/gtkmm2ext/cairo_widget.h | 10 +-- libs/gtkmm2ext/gtkmm2ext/cairocell.h | 6 +- .../gtkmm2ext/cell_renderer_pixbuf_multi.h | 2 +- .../gtkmm2ext/cell_renderer_pixbuf_toggle.h | 2 +- libs/gtkmm2ext/gtkmm2ext/dndtreeview.h | 22 +++--- libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 86 +++++++++++----------- libs/gtkmm2ext/gtkmm2ext/focus_entry.h | 2 +- libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h | 2 +- libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 2 +- libs/gtkmm2ext/gtkmm2ext/keyboard.h | 2 +- libs/gtkmm2ext/gtkmm2ext/motionfeedback.h | 4 +- libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h | 2 +- libs/gtkmm2ext/gtkmm2ext/pixscroller.h | 2 +- libs/gtkmm2ext/gtkmm2ext/scroomer.h | 2 +- libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 2 +- libs/gtkmm2ext/gtkmm2ext/textviewer.h | 2 +- libs/gtkmm2ext/gtkmm2ext/utils.h | 10 +-- libs/gtkmm2ext/gtkmm2ext/widget_state.h | 2 +- libs/gtkmm2ext/idle_adjustment.cc | 4 +- libs/gtkmm2ext/keyboard.cc | 2 +- libs/gtkmm2ext/motionfeedback.cc | 30 ++++---- libs/gtkmm2ext/persistent_tooltip.cc | 4 +- libs/gtkmm2ext/pixscroller.cc | 12 +-- libs/gtkmm2ext/popup.cc | 4 +- libs/gtkmm2ext/prompter.cc | 8 +- libs/gtkmm2ext/scroomer.cc | 26 +++---- libs/gtkmm2ext/selector.cc | 2 +- libs/gtkmm2ext/sync-menu.c | 4 +- libs/gtkmm2ext/tearoff.cc | 12 +-- libs/gtkmm2ext/textviewer.cc | 2 +- libs/gtkmm2ext/utils.cc | 24 +++--- libs/gtkmm2ext/window_title.cc | 2 +- 51 files changed, 223 insertions(+), 223 deletions(-) (limited to 'libs/gtkmm2ext') diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index a4c8be1774..9471067de9 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -259,7 +259,7 @@ ActionManager::enable_accelerators () for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { ui_string += " @@ -493,7 +493,7 @@ void ActionManager::set_toggleaction_state (string n, bool s) { char const * name = n.c_str (); - + const char *last_slash = strrchr (name, '/'); if (last_slash == 0) { @@ -526,13 +526,13 @@ string ActionManager::get_key_representation (const string& accel_path, AccelKey& key) { bool known = lookup_entry (accel_path, key); - + if (known) { uint32_t k = possibly_translate_legal_accelerator_to_real_key (key.get_key()); key = AccelKey (k, Gdk::ModifierType (key.get_mod())); return ui_manager->get_accel_group()->get_label (key.get_key(), Gdk::ModifierType (key.get_mod())); } - + return unbound_string; } diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc index 87473adcd2..dfa2b4ac7c 100644 --- a/libs/gtkmm2ext/binding_proxy.cc +++ b/libs/gtkmm2ext/binding_proxy.cc @@ -37,12 +37,12 @@ guint BindingProxy::bind_statemask = Gdk::CONTROL_MASK; BindingProxy::BindingProxy (boost::shared_ptr c) : prompter (0), controllable (c) -{ +{ } BindingProxy::BindingProxy () : prompter (0) -{ +{ } BindingProxy::~BindingProxy () @@ -89,7 +89,7 @@ BindingProxy::button_press_handler (GdkEventButton *ev) } return true; } - + return false; } diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc index d9449ebb6b..71f35fcf36 100644 --- a/libs/gtkmm2ext/cairo_packer.cc +++ b/libs/gtkmm2ext/cairo_packer.cc @@ -27,9 +27,9 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*) int x, y; Gtk::Widget* window_parent; Glib::RefPtr win = Gtkmm2ext::window_to_draw_on (w, &window_parent); - + if (win) { - + Cairo::RefPtr context = win->create_cairo_context(); w.translate_coordinates (*window_parent, 0, 0, x, y); diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index aa8f883a7d..a597a7e29d 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -38,7 +38,7 @@ void CairoWidget::set_source_rgb_a( cairo_t* cr, Gdk::Color col, float a) //ToD float r = col.get_red_p (); float g = col.get_green_p (); float b = col.get_blue_p (); - + cairo_set_source_rgba(cr, r, g, b, a); } @@ -139,9 +139,9 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) cairo_context->paint (); } #endif - + Gtk::Widget* child = get_child (); - + if (child) { propagate_expose (*child, ev); } @@ -187,9 +187,9 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) /* paint expose area the color of the parent window bg */ - + Gdk::Color bg (get_parent_bg()); - + cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); cr->fill (); @@ -219,7 +219,7 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE } #endif - + return true; } diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index 4a6056e192..4de898c832 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -149,9 +149,9 @@ CairoTextCell::set_size (Cairo::RefPtr& context) for (n = 0; n < lim; ++n) { buf[n] = '0' + digit; } - + context->get_text_extents (&buf[0], ext); - + max_width = max (ext.width + ext.x_bearing, max_width); max_height = max (ext.height, max_height); bsum += ext.x_bearing; @@ -179,7 +179,7 @@ CairoCharCell::set_size (Cairo::RefPtr& context) Cairo::TextExtents ext; _font->apply (context); - + { const char* buf = "8"; context->get_text_extents (buf, ext); @@ -251,7 +251,7 @@ void CairoEditableText::add_cell (CairoCell* cell) { cells.push_back (cell); - + CairoTextCell* tc = dynamic_cast(cell); if (tc) { @@ -306,7 +306,7 @@ CairoEditableText::on_expose_event (GdkEventExpose* ev) Gtk::Allocation alloc = get_allocation (); double width = alloc.get_width(); double height = alloc.get_height (); - + if (_draw_bg) { context->set_source_rgba (bg_r, bg_g, bg_b, bg_a); if (_corner_radius) { @@ -316,14 +316,14 @@ CairoEditableText::on_expose_event (GdkEventExpose* ev) } context->fill (); } - + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { CairoCell* cell = (*i); /* is cell inside the expose area? */ - + if (cell->intersects (ev->area)) { if (cell == editing_cell) { context->set_source_rgba (edit_r, edit_b, edit_g, edit_a); @@ -413,9 +413,9 @@ CairoEditableText::set_cell_sizes () if (!win) { return; } - + Cairo::RefPtr context = win->create_cairo_context(); - + if (!context) { return; } @@ -432,7 +432,7 @@ CairoEditableText::on_size_request (GtkRequisition* req) max_cell_width = 0; max_cell_height = 0; - + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { max_cell_width += (*i)->width(); max_cell_height = std::max ((double) (*i)->height(), max_cell_height); diff --git a/libs/gtkmm2ext/cell_renderer_color_selector.cc b/libs/gtkmm2ext/cell_renderer_color_selector.cc index 62419b423d..f8093cca1d 100644 --- a/libs/gtkmm2ext/cell_renderer_color_selector.cc +++ b/libs/gtkmm2ext/cell_renderer_color_selector.cc @@ -46,7 +46,7 @@ CellRendererColorSelector::CellRendererColorSelector() c.set_red (0); c.set_green (0); c.set_blue (0); - + property_color() = c; } @@ -70,21 +70,21 @@ CellRendererColorSelector::render_vfunc (const Glib::RefPtr& wind cairo_t* cr = gdk_cairo_create (window->gobj()); double r, g, b; Gdk::Color c = _property_color.get_value(); - + cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height()); cairo_clip (cr); - + r = c.get_red_p(); g = c.get_green_p(); b = c.get_blue_p(); - + cairo_rectangle_t drawing_rect; - + drawing_rect.x = cell_area.get_x() + property_xpad(); drawing_rect.y = cell_area.get_y() + property_ypad(); drawing_rect.width = cell_area.get_width() - (2 * property_xpad()); drawing_rect.height = cell_area.get_height() - (2 * property_ypad()); - + Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5); cairo_set_source_rgb (cr, r, g, b); cairo_fill (cr); diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc index c5c9eb98b0..181e0db0f7 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc @@ -70,7 +70,7 @@ CellRendererPixbufMulti::render_vfunc (const Glib::RefPtr& window offset_width = cell_area.get_x() + (int)(cell_area.get_width() - pb->get_width())/2; offset_height = cell_area.get_y() + (int)(cell_area.get_height() - pb->get_height())/2; - + window->draw_pixbuf (RefPtr(), pb, 0, 0, offset_width, offset_height, -1, -1, Gdk::RGB_DITHER_NORMAL, 0, 0); } diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc index 9fefbfb88e..af709b488f 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc @@ -75,7 +75,7 @@ CellRendererPixbufToggle::render_vfunc (const Glib::RefPtr& windo { int offset_width = 0; int offset_height = 0; - + if(property_active() == true){ offset_width = cell_area.get_x() + (int)(cell_area.get_width() - inactive_pixbuf->get_width())/2; diff --git a/libs/gtkmm2ext/choice.cc b/libs/gtkmm2ext/choice.cc index 4cce090bcc..5dde9426e7 100644 --- a/libs/gtkmm2ext/choice.cc +++ b/libs/gtkmm2ext/choice.cc @@ -31,7 +31,7 @@ Choice::Choice (string title, string prompt, vector choices, bool center { int n; vector::iterator i; - + if (center) { set_position (Gtk::WIN_POS_CENTER); } else { @@ -49,7 +49,7 @@ Choice::Choice (string title, string prompt, vector choices, bool center get_vbox()->set_border_width (12); get_vbox()->pack_start (*dhbox, true, false); - + set_has_separator (false); set_resizable (false); show_all_children (); diff --git a/libs/gtkmm2ext/click_box.cc b/libs/gtkmm2ext/click_box.cc index 8782acaae8..876c68f665 100644 --- a/libs/gtkmm2ext/click_box.cc +++ b/libs/gtkmm2ext/click_box.cc @@ -135,21 +135,21 @@ ClickBox::on_expose_event (GdkEventExpose *ev) Glib::RefPtr fg_gc (style->get_fg_gc (Gtk::STATE_NORMAL)); Glib::RefPtr bg_gc (style->get_bg_gc (Gtk::STATE_NORMAL)); Glib::RefPtr win (get_window()); - + GdkRectangle base_rect; GdkRectangle draw_rect; gint x, y, width, height, depth; - + win->get_geometry (x, y, width, height, depth); - + base_rect.width = width; base_rect.height = height; base_rect.x = 0; base_rect.y = 0; - + gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect); win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height); - + if (twidth && theight) { win->draw_layout (fg_gc, (width - twidth) / 2, (height - theight) / 2, layout); } diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc index 06d17fce40..53b212d711 100644 --- a/libs/gtkmm2ext/dndtreeview.cc +++ b/libs/gtkmm2ext/dndtreeview.cc @@ -49,10 +49,10 @@ DnDTreeViewBase::add_drop_targets (list& targets) for (list::iterator i = targets.begin(); i != targets.end(); ++i) { draggable.push_back (*i); } - + enable_model_drag_source (draggable); enable_model_drag_dest (draggable); -} +} void DnDTreeViewBase::add_object_drag (int column, string type_name) diff --git a/libs/gtkmm2ext/fader.cc b/libs/gtkmm2ext/fader.cc index a899e5906a..9a2f5a2cd9 100644 --- a/libs/gtkmm2ext/fader.cc +++ b/libs/gtkmm2ext/fader.cc @@ -162,7 +162,7 @@ Fader::get_image_scales (double &x_scale, double &y_scale) int pbheight = _face_pixbuf->get_height (); int width = get_width (); int height = get_height (); - + if ((width != pbwidth) || (height != pbheight)) { x_scale = double (width) / double (pbwidth); if (x_scale == 0.0) { @@ -186,17 +186,17 @@ Fader::set_touch_cursor (const Glib::RefPtr& touch_cursor) void Fader::render (cairo_t* cr, cairo_rectangle_t*) { - + double xscale = 1.0; double yscale = 1.0; - + get_image_scales (xscale, yscale); - + cairo_matrix_t matrix; cairo_get_matrix (cr, &matrix); cairo_matrix_scale (&matrix, xscale, yscale); cairo_set_matrix (cr, &matrix); - + get_handle_position (_last_drawn_x, _last_drawn_y); if (_underlay_pixbuf != 0) { @@ -264,9 +264,9 @@ Fader::on_button_press_event (GdkEventButton* ev) double xscale = 1.0; double yscale = 1.0; - + get_image_scales (xscale, yscale); - + double hw = _handle_pixbuf->get_width() * xscale; double hh = _handle_pixbuf->get_height() * yscale; @@ -276,16 +276,16 @@ Fader::on_button_press_event (GdkEventButton* ev) double ev_pos_x; double ev_pos_y; - + get_closest_point_on_line(_min_pos_x, _min_pos_y, _max_pos_x, _max_pos_y, ev->x, ev->y, ev_pos_x, ev_pos_y ); add_modal_grab (); - + _grab_window = ev->window; _dragging = true; - + gdk_pointer_grab(ev->window,false, GdkEventMask (Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK), NULL, @@ -293,7 +293,7 @@ Fader::on_button_press_event (GdkEventButton* ev) ev->time); queue_draw(); - + return true; } @@ -368,7 +368,7 @@ Fader::on_motion_notify_event (GdkEventMotion* ev) if (_dragging) { double ev_pos_x; double ev_pos_y; - + if (ev->window != _grab_window) { _grab_window = ev->window; return true; @@ -378,12 +378,12 @@ Fader::on_motion_notify_event (GdkEventMotion* ev) _max_pos_x, _max_pos_y, _grab_start_handle_x + (ev->x - _grab_start_mouse_x), _grab_start_handle_y + (ev->y - _grab_start_mouse_y), ev_pos_x, ev_pos_y ); - + double const fract = sqrt((ev_pos_x - _min_pos_x) * (ev_pos_x - _min_pos_x) + (ev_pos_y - _min_pos_y) * (ev_pos_y - _min_pos_y)) / sqrt((double)((_max_pos_x - _min_pos_x) * (_max_pos_x - _min_pos_x) + (_max_pos_y - _min_pos_y) * (_max_pos_y - _min_pos_y))); - + adjustment.set_value (adjustment.get_lower() + (adjustment.get_upper() - adjustment.get_lower()) * fract); } return true; diff --git a/libs/gtkmm2ext/grouped_buttons.cc b/libs/gtkmm2ext/grouped_buttons.cc index e9d2c1c422..48a2ed1ab0 100644 --- a/libs/gtkmm2ext/grouped_buttons.cc +++ b/libs/gtkmm2ext/grouped_buttons.cc @@ -46,9 +46,9 @@ GroupedButtons::GroupedButtons (uint32_t nbuttons, uint32_t first_active) for (uint32_t n = 0; n < nbuttons; ++n) { Gtk::ToggleButton *button; - + button = manage (new (Gtk::ToggleButton)); - + if (n == current_active) { button->set_active (true); } diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index d06e60ccd6..d160146859 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -71,12 +71,12 @@ UI::UI (string namestr, int *argc, char ***argv) : AbstractUI (namestr) , _receiver (*this) , errors (0) - + { theMain = new Main (argc, argv); pthread_set_name ("gui"); - + _active = false; if (!theGtkUI) { @@ -91,7 +91,7 @@ UI::UI (string namestr, int *argc, char ***argv) */ run_loop_thread = Threads::Thread::self(); - + /* store "this" as the UI-for-thread of this thread, same argument as for previous line. */ @@ -144,7 +144,7 @@ UI::load_rcfile (string path, bool themechange) * This does not occur if wiget.get_style is used instead of rc.get_style below, * except that doesn't actually work... */ - + static Glib::RefPtr