Warning and whitespace cleanup

(bzr r4838)

5 files changed, 79 insertions, 76 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 4846158a7..2767a32d1 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -99,7 +99,7 @@ class ActionAlign : public Action {
 public :
     struct Coeffs {
        double mx0, mx1, my0, my1;
-	double sx0, sx1, sy0, sy1;
+       double sx0, sx1, sy0, sy1;
     };
     ActionAlign(const Glib::ustring &id,
                 const Glib::ustring &tiptext,
@@ -392,7 +392,7 @@ private :
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
         if (changed) {
-            sp_document_done ( sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+            sp_document_done ( sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                                _("Distribute"));
         }
     }
@@ -427,8 +427,8 @@ private :
     {
 
         if (!_dialog.getDesktop()) return;
-	SPEventContext *event_context = sp_desktop_event_context(_dialog.getDesktop());
-	if (!SP_IS_NODE_CONTEXT (event_context)) return ;
+        SPEventContext *event_context = sp_desktop_event_context(_dialog.getDesktop());
+        if (!SP_IS_NODE_CONTEXT (event_context)) return ;
 
         if (_distribute)
             SP_NODE_CONTEXT (event_context)->shape_editor->distribute(_orientation);
@@ -455,7 +455,7 @@ public:
                dialog.removeOverlap_table(), dialog.tooltips(), dialog)
     {
         dialog.removeOverlap_table().set_col_spacings(3);
-    
+
         removeOverlapXGap.set_digits(1);
         removeOverlapXGap.set_size_request(60, -1);
         removeOverlapXGap.set_increments(1.0, 5.0);
@@ -501,7 +501,7 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+        sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                          _("Remove overlaps"));
     }
 };
@@ -531,7 +531,7 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+        sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                          _("Arrange connector network"));
     }
 };
@@ -561,7 +561,7 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done (sp_desktop_document (_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+        sp_document_done (sp_desktop_document (_dialog.getDesktop()), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                           _("Unclump"));
     }
 };
@@ -617,7 +617,7 @@ private :
             sp_document_ensure_up_to_date(sp_desktop_document (desktop));
             NR::Maybe<NR::Rect> item_box = sp_item_bbox_desktop (*it);
             if (item_box) {
-                // find new center, staying within bbox 
+                // find new center, staying within bbox
                 double x = _dialog.randomize_bbox->min()[NR::X] + item_box->extent(NR::X)/2 +
                     g_random_double_range (0, _dialog.randomize_bbox->extent(NR::X) - item_box->extent(NR::X));
                 double y = _dialog.randomize_bbox->min()[NR::Y] + item_box->extent(NR::Y)/2 +
@@ -631,7 +631,7 @@ private :
         // restore compensation setting
         prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
 
-        sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+        sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                           _("Randomize positions"));
     }
 };
@@ -728,7 +728,7 @@ private :
             }
 
             if (changed) {
-                sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                                   _("Distribute text baselines"));
             }
 
@@ -748,7 +748,7 @@ private :
             }
 
             if (changed) {
-                sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, 
+                sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_ALIGN_DISTRIBUTE,
                                   _("Align text baselines"));
             }
         }
@@ -757,14 +757,14 @@ private :
 
 
 
-void on_tool_changed(Inkscape::Application *inkscape, SPEventContext *context, AlignAndDistribute *daad)
+void on_tool_changed(Inkscape::Application */*inkscape*/, SPEventContext */*context*/, AlignAndDistribute *daad)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop && sp_desktop_event_context(desktop))
         daad->setMode(tools_active(desktop) == TOOLS_NODES);
 }
 
-void on_selection_changed(Inkscape::Application *inkscape, Inkscape::Selection *selection, AlignAndDistribute *daad)
+void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection */*selection*/, AlignAndDistribute *daad)
 {
     daad->randomize_bbox = NR::Nothing();
 }
@@ -774,7 +774,7 @@ void on_selection_changed(Inkscape::Application *inkscape, Inkscape::Selection *
 
 
 
-AlignAndDistribute::AlignAndDistribute() 
+AlignAndDistribute::AlignAndDistribute()
     : UI::Widget::Panel ("", "dialogs.align", SP_VERB_DIALOG_ALIGN_DISTRIBUTE),
       randomize_bbox(NR::Nothing()),
       _alignFrame(_("Align")),
@@ -946,7 +946,7 @@ AlignAndDistribute::AlignAndDistribute()
     on_tool_changed (NULL, NULL, this); // set current mode
 }
 
-AlignAndDistribute::~AlignAndDistribute() 
+AlignAndDistribute::~AlignAndDistribute()
 {
     sp_signal_disconnect_by_data (G_OBJECT (INKSCAPE), this);
 
@@ -1055,7 +1055,7 @@ void AlignAndDistribute::addBaselineButton(const Glib::ustring &id, const Glib::
 {
     _actionList.push_back(
         new ActionBaseline(
-            id, tiptext, row, col, 
+            id, tiptext, row, col,
             *this, table, orientation, distribute));
 }
 
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 7d2242802..1361b4977 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -4,7 +4,7 @@
  *
  * Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
- *   buliabyak@gmail.com 
+ *   buliabyak@gmail.com
  *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
  *   Gustav Broberg <broberg@kth.se>
  *
@@ -42,7 +42,7 @@ namespace UI {
 namespace Dialog {
 
 void
-sp_retransientize(Inkscape::Application *inkscape, SPDesktop *desktop, gpointer dlgPtr)
+sp_retransientize(Inkscape::Application */*inkscape*/, SPDesktop *desktop, gpointer dlgPtr)
 {
     Dialog *dlg = (Dialog *)dlgPtr;
     dlg->onDesktopActivated (desktop);
@@ -57,14 +57,14 @@ sp_retransientize_again(gpointer dlgPtr)
 }
 
 void
-sp_dialog_shutdown(GtkObject *object, gpointer dlgPtr)
+sp_dialog_shutdown(GtkObject */*object*/, gpointer dlgPtr)
 {
     Dialog *dlg = (Dialog *)dlgPtr;
     dlg->onShutdown();
 }
 
 
-void hideCallback(GtkObject *object, gpointer dlgPtr)
+void hideCallback(GtkObject */*object*/, gpointer dlgPtr)
 {
     g_return_if_fail( dlgPtr != NULL );
 
@@ -72,7 +72,7 @@ void hideCallback(GtkObject *object, gpointer dlgPtr)
     dlg->onHideF12();
 }
 
-void unhideCallback(GtkObject *object, gpointer dlgPtr)
+void unhideCallback(GtkObject */*object*/, gpointer dlgPtr)
 {
     g_return_if_fail( dlgPtr != NULL );
 
@@ -95,7 +95,7 @@ void unhideCallback(GtkObject *object, gpointer dlgPtr)
  */
 
 Dialog::Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_path, int verb_num,
-               Glib::ustring const &apply_label) 
+               Glib::ustring const &apply_label)
     : _hiddenF12 (false),
       _prefs_path (prefs_path),
       _verb_num(verb_num),
@@ -109,7 +109,7 @@ Dialog::Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_pat
     _title = title;
 
     _behavior = behavior_factory(*this);
-    
+
     if (Inkscape::NSApplication::Application::getNewGui()) {
         _desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*this, &Dialog::onDesktopActivated));
         _dialogs_hidden_connection = Inkscape::NSApplication::Editor::connectDialogsHidden (sigc::mem_fun (*this, &Dialog::onHideF12));
@@ -137,7 +137,7 @@ Dialog::~Dialog()
         _dialogs_unhidden_connection.disconnect();
         _shutdown_connection.disconnect();
     }
-    
+
     save_geometry();
     delete _behavior;
 }
@@ -152,7 +152,7 @@ Dialog::onDesktopActivated(SPDesktop *desktop)
     _behavior->onDesktopActivated(desktop);
 }
 
-void 
+void
 Dialog::onShutdown()
 {
     save_geometry();
@@ -218,7 +218,7 @@ Dialog::read_geometry()
     if (w != 0 && h != 0) {
         resize(w, h);
     }
-    
+
     // If there are stored values for where the dialog should be
     // located, then restore the dialog to that position.
     // also check if (x,y) is actually onscreen with the current screen dimensions
@@ -264,7 +264,7 @@ Dialog::_handleResponse(int response_id)
 }
 
 bool
-Dialog::_onDeleteEvent(GdkEventAny *event)
+Dialog::_onDeleteEvent(GdkEventAny */*event*/)
 {
     save_geometry();
     _user_hidden = true;
@@ -342,12 +342,12 @@ Dialog::_close()
     event.window = dlg->window;
     event.send_event = TRUE;
 
-    if (event.window) 
+    if (event.window)
         g_object_ref(G_OBJECT(event.window));
 
     gtk_main_do_event ((GdkEvent*)&event);
 
-    if (event.window) 
+    if (event.window)
         g_object_unref(G_OBJECT(event.window));
 }
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index 13ce20abe..4f6fe64bc 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -41,10 +41,10 @@ DockBehavior::DockBehavior(Dialog &dialog) :
     Behavior(dialog),
     _dock_item(*SP_ACTIVE_DESKTOP->getDock(),
                Inkscape::Verb::get(dialog._verb_num)->get_id(), dialog._title.c_str(),
-               (Inkscape::Verb::get(dialog._verb_num)->get_image() ? 
+               (Inkscape::Verb::get(dialog._verb_num)->get_image() ?
                 Inkscape::Verb::get(dialog._verb_num)->get_image() : ""),
                static_cast<Widget::DockItem::State>(
-                   prefs_get_int_attribute (_dialog._prefs_path, "state", 
+                   prefs_get_int_attribute (_dialog._prefs_path, "state",
                                             UI::Widget::DockItem::DOCKED_STATE)))
 {
     // Connect signals
@@ -87,7 +87,7 @@ DockBehavior::get_vbox()
 }
 
 void
-DockBehavior::present() 
+DockBehavior::present()
 {
     bool was_attached = _dock_item.isAttached();
 
@@ -106,31 +106,31 @@ DockBehavior::hide()
 }
 
 void
-DockBehavior::show() 
-{ 
+DockBehavior::show()
+{
     _dock_item.show();
 }
 
-void 
+void
 DockBehavior::show_all_children()
 {
     get_vbox()->show_all_children();
 }
 
-void 
+void
 DockBehavior::get_position(int &x, int &y)
-{ 
+{
     _dock_item.get_position(x, y);
 }
 
-void 
+void
 DockBehavior::get_size(int &width, int &height)
-{ 
+{
     _dock_item.get_size(width, height);
 }
 
 void
-DockBehavior::resize(int width, int height) 
+DockBehavior::resize(int width, int height)
 {
     _dock_item.resize(width, height);
 }
@@ -153,9 +153,9 @@ DockBehavior::set_size_request(int width, int height)
     _dock_item.set_size_request(width, height);
 }
 
-void 
+void
 DockBehavior::size_request(Gtk::Requisition &requisition)
-{ 
+{
     _dock_item.size_request(requisition);
 }
 
@@ -168,6 +168,7 @@ DockBehavior::set_title(Glib::ustring title)
 void
 DockBehavior::set_sensitive(bool sensitive)
 {
+    // TODO check this. Seems to be bad that we ignore the parameter
     get_vbox()->set_sensitive();
 }
 
@@ -181,9 +182,10 @@ DockBehavior::_onHide()
 }
 
 void
-DockBehavior::_onStateChanged(Widget::DockItem::State prev_state, 
+DockBehavior::_onStateChanged(Widget::DockItem::State /*prev_state*/,
                               Widget::DockItem::State new_state)
 {
+// TODO probably need to avoid window calls unless the state is different. Check.
     prefs_set_int_attribute (_dialog._prefs_path, "state", new_state);
 
     if (new_state == Widget::DockItem::FLOATING_STATE) {
@@ -219,11 +221,11 @@ DockBehavior::onDesktopActivated(SPDesktop *desktop)
 #ifdef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs
     if (prefs_get_int_attribute ( "options.dialogsontopwin32", "value", 0))
         transient_policy = 2;
-    else    
+    else
         return;
-#endif        
+#endif
 
-    if (!transient_policy) 
+    if (!transient_policy)
         return;
 
     Gtk::Window *floating_win = _dock_item.getWindow();
@@ -243,7 +245,7 @@ DockBehavior::onDesktopActivated(SPDesktop *desktop)
         if (GtkWindow *dialog_win = floating_win->gobj()) {
 
             _dialog.retransientize_suppress = true; // disallow other attempts to retranzientize this dialog
-            
+
             desktop->setWindowTransient (dialog_win);
 
             /*
@@ -267,13 +269,13 @@ DockBehavior::onDesktopActivated(SPDesktop *desktop)
 
 /* Signal wrappers */
 
-Glib::SignalProxy0<void> 
+Glib::SignalProxy0<void>
 DockBehavior::signal_show() { return _dock_item.signal_show(); }
 
-Glib::SignalProxy0<void> 
+Glib::SignalProxy0<void>
 DockBehavior::signal_hide() { return _dock_item.signal_hide(); }
 
-Glib::SignalProxy1<bool, GdkEventAny *> 
+Glib::SignalProxy1<bool, GdkEventAny *>
 DockBehavior::signal_delete_event() { return _dock_item.signal_delete_event(); }
 
 Glib::SignalProxy0<void>
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index b4199c678..66b1ddf56 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -283,7 +283,7 @@ DocumentProperties::build_snap()
                   _("If set, objects only snap to a grid line when it's within the range specified below"),
                   "gridtolerance", _wr);
 
-	//Options for snapping to guides
+    //Options for snapping to guides
     _rsu_gusn.init (_("Snap dist_ance"), _("Snap only when close_r than:"),
                 _("Snapping distance, in screen pixels, for snapping to guides"),
                 _("If set, objects only snap to a guide when it's within the range specified below"),
@@ -300,24 +300,24 @@ DocumentProperties::build_snap()
     slaves.push_back(&_rcbsnbbp);
     slaves.push_back(&_rcbsnbbn);
     _rcbsnbb.setSlaveWidgets(slaves);
-    
+
     slaves.clear();
     slaves.push_back(&_rcbsnn);
     slaves.push_back(&_rcbsnbb);
-    
+
     _rcbsg.setSlaveWidgets(slaves);
 
     Gtk::Label *label_g = manage (new Gtk::Label);
     label_g->set_markup (_("<b>Snapping</b>"));
     Gtk::Label *label_w = manage (new Gtk::Label);
-    label_w->set_markup (_("<b>What snaps</b>"));    
+    label_w->set_markup (_("<b>What snaps</b>"));
     Gtk::Label *label_o = manage (new Gtk::Label);
     label_o->set_markup (_("<b>Snap to objects</b>"));
     Gtk::Label *label_gr = manage (new Gtk::Label);
     label_gr->set_markup (_("<b>Snap to grids</b>"));
     Gtk::Label *label_gu = manage (new Gtk::Label);
     label_gu->set_markup (_("<b>Snap to guides</b>"));
-    
+
     Gtk::Widget *const array[] =
     {
         label_g,            0,
@@ -326,19 +326,19 @@ DocumentProperties::build_snap()
         label_w,            0,
         0,                  &_rcbsnn,
         0,                  &_rcbsnbb,
-        0, 					0,
+        0,                  0,
         label_o,            0,
         0,                  &_rcbsnop,
         0,                  &_rcbsnon,
         0,                  &_rcbsnbbp,
         0,                  &_rcbsnbbn,
         0,                  _rsu_sno._vbox,
-        0, 					0,
+        0,                  0,
         label_gr,           0,
         0,                  _rsu_sn._vbox,
-        0, 					0,
-        label_gu,         	0,
-        0,                	_rsu_gusn._vbox
+        0,                  0,
+        label_gu,           0,
+        0,                  _rsu_gusn._vbox
     };
 
     attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
@@ -422,6 +422,7 @@ DocumentProperties::build_gridspage()
 
     SPDesktop *dt = getDesktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
+    (void)nv;
 
     _grids_label_crea.set_markup(_("<b>Creation</b>"));
     _grids_label_def.set_markup(_("<b>Defined grids</b>"));
@@ -488,7 +489,7 @@ DocumentProperties::update()
     _rcbsng.setActive (nv->snap_manager.getSnapModeGuide());
     _rcbic.setActive (nv->snap_manager.getIncludeItemCenter());
     _rcbsigg.setActive (nv->snap_manager.getSnapIntersectionGG());
-    _rcbsils.setActive (nv->snap_manager.getSnapIntersectionLS());    
+    _rcbsils.setActive (nv->snap_manager.getSnapIntersectionLS());
     _rcbsnop.setActive(nv->snap_manager.object.getSnapToItemPath());
     _rcbsnon.setActive(nv->snap_manager.object.getSnapToItemNode());
     _rcbsnbbp.setActive(nv->snap_manager.object.getSnapToBBoxPath());
@@ -498,8 +499,8 @@ DocumentProperties::update()
     _rsu_sn.setValue (nv->gridtolerance);
 
     _rsu_gusn.setValue (nv->guidetolerance);
-    
-    _rcbsg.setActive (nv->snap_manager.getSnapEnabledGlobally());    
+
+    _rcbsg.setActive (nv->snap_manager.getSnapEnabledGlobally());
 
     //-----------------------------------------------------------grids page
 
@@ -541,7 +542,7 @@ DocumentProperties::on_response (int id)
         hide();
 }
 
-void 
+void
 DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document)
 {
     Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
@@ -551,7 +552,7 @@ DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *docu
     update();
 }
 
-void 
+void
 DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
     Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
@@ -574,14 +575,14 @@ static void
 on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
 {
     if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
-	dialog->update_gridspage();
+        dialog->update_gridspage();
 }
 
 static void
 on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
 {
     if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
-	dialog->update_gridspage();
+        dialog->update_gridspage();
 }
 
 
@@ -593,7 +594,7 @@ static void
 on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data)
 {
     if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
-	dialog->update();
+        dialog->update();
 }
 
 
@@ -652,7 +653,7 @@ DocumentProperties::onRemoveGrid()
   mode:c++
   c-file-style:"stroustrup"
   c-file-offsets:((innamespace . 0)(inline-open . 0))
-  indent-tabs-mode:nilu
+  indent-tabs-mode:nil
   fill-column:99
   End:
 */
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 4528fe656..3deb4204a 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -29,9 +29,9 @@
 
 
 static void
-draw_page (GtkPrintOperation *operation,
+draw_page (GtkPrintOperation */*operation*/,
            GtkPrintContext   *context,
-           gint               page_nr,
+           gint               /*page_nr*/,
            gpointer           user_data)
 {
     struct workaround_gtkmm *junk = (struct workaround_gtkmm*)user_data;
@@ -112,8 +112,8 @@ draw_page (GtkPrintOperation *operation,
 }
 
 static GObject*
-create_custom_widget (GtkPrintOperation *operation,
-                      gpointer           user_data) 
+create_custom_widget (GtkPrintOperation */*operation*/,
+                      gpointer           user_data)
 {
     //printf("%s\n",__FUNCTION__);
     return G_OBJECT(user_data);
@@ -121,8 +121,8 @@ create_custom_widget (GtkPrintOperation *operation,
 
 static void
 begin_print (GtkPrintOperation *operation,
-             GtkPrintContext   *context,
-             gpointer           user_data) 
+             GtkPrintContext   */*context*/,
+             gpointer           /*user_data*/)
 {
     //printf("%s\n",__FUNCTION__);
     gtk_print_operation_set_n_pages (operation, 1);