Convert a load more C-style pointer casts to GObject or C++ casts (merry christmas\!)

(bzr r11986)

6 files changed, 38 insertions, 38 deletions

diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index da38e2dde..429ed57bf 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -126,7 +126,7 @@ void DebugDialogImpl::show()
 {
     //call super()
     Gtk::Dialog::show();
-    //sp_transientize((GtkWidget *)gobj());  //Make transient
+    //sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     raise();
     Gtk::Dialog::present();
 }
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 553acac84..75f80ed4a 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -100,9 +100,9 @@ findEntryWidgets(Gtk::Container *parent,
         Gtk::Widget *child = children[i];
         GtkWidget *wid = child->gobj();
         if (GTK_IS_ENTRY(wid))
-           result.push_back((Gtk::Entry *)child);
+           result.push_back(dynamic_cast<Gtk::Entry *>(child));
         else if (GTK_IS_CONTAINER(wid))
-            findEntryWidgets((Gtk::Container *)child, result);
+            findEntryWidgets(dynamic_cast<Gtk::Container *>(child), result);
         }
 
 }
@@ -119,9 +119,9 @@ findExpanderWidgets(Gtk::Container *parent,
         Gtk::Widget *child = children[i];
         GtkWidget *wid = child->gobj();
         if (GTK_IS_EXPANDER(wid))
-           result.push_back((Gtk::Expander *)child);
+           result.push_back(dynamic_cast<Gtk::Expander *>(child));
         else if (GTK_IS_CONTAINER(wid))
-            findExpanderWidgets((Gtk::Container *)child, result);
+            findExpanderWidgets(dynamic_cast<Gtk::Container *>(child), result);
         }
 
 }
@@ -522,7 +522,7 @@ bool SVGPreview::set(Glib::ustring &fileName, int dialogType)
     if (Glib::file_test(fileName, Glib::FILE_TEST_IS_REGULAR))
         {
         Glib::ustring fileNameUtf8 = Glib::filename_to_utf8(fileName);
-        gchar *fName = (gchar *)fileNameUtf8.c_str();
+        gchar *fName = const_cast<gchar *>(fileNameUtf8.c_str());
         struct stat info;
         if (g_stat(fName, &info))
             {
@@ -898,7 +898,7 @@ bool
 FileOpenDialogImplGtk::show()
 {
     set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
+    sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     gint b = run();                        //Dialog
     svgPreview.showNoPreview();
     hide();
@@ -1241,7 +1241,7 @@ FileSaveDialogImplGtk::show()
 {
     change_path(myFilename);
     set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
+    sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     gint b = run();                        //Dialog
     svgPreview.showNoPreview();
     set_preview_widget_active(false);
@@ -1688,7 +1688,7 @@ FileExportDialogImpl::show()
         s = getcwd (NULL, 0);
     set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing
     set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
+    sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     gint b = run();                        //Dialog
     svgPreview.showNoPreview();
     hide();
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 8f5f2ed22..82bc85099 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -139,7 +139,7 @@ bool
 ExportDialog::show()
 {
     set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
+    sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     gint b = run();                        //Dialog
     hide();
 
@@ -244,7 +244,7 @@ bool
 ExportPasswordDialog::show()
 {
     set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
+    sp_transientize(GTK_WIDGET(gobj()));  //Make transient
     gint b = run();                        //Dialog
     hide();
 
@@ -957,40 +957,40 @@ void SearchResultList::populate_from_xml(xmlNode * a_node)
     for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next) {
 
         // Get items information
-        if (strcmp((const char*)cur_node->name, "rss")) // Avoid the root
+        if (strcmp(reinterpret_cast<const char*>(cur_node->name), "rss")) // Avoid the root
             if (cur_node->type == XML_ELEMENT_NODE &&
-                    (cur_node->parent->name && !strcmp((const char*)cur_node->parent->name, "item")))
+                    (cur_node->parent->name && !strcmp(reinterpret_cast<const char*>(cur_node->parent->name), "item")))
             {
-                if (!strcmp((const char*)cur_node->name, "title"))
+                if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "title"))
                 {
                     row_num = append("");
                     xmlChar *xml_title = xmlNodeGetContent(cur_node);
-                    char* title = (char*) xml_title;
+                    char* title = reinterpret_cast<char*>(xml_title);
                     
                     set_text(row_num, RESULTS_COLUMN_TITLE, title);
                     xmlFree(title);
                 }
-                else if (!strcmp((const char*)cur_node->name, "pubDate"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "pubDate"))
                 {
                     xmlChar *xml_date = xmlNodeGetContent(cur_node);
-                    char* date = (char*) xml_date;
+                    char* date = reinterpret_cast<char*>(xml_date);
                     
                     set_text(row_num, RESULTS_COLUMN_DATE, date);
                     xmlFree(xml_date);
                 }
-                else if (!strcmp((const char*)cur_node->name, "creator"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "creator"))
                 {
                     xmlChar *xml_creator = xmlNodeGetContent(cur_node);
-                    char* creator = (char*) xml_creator;
+                    char* creator = reinterpret_cast<char*>(xml_creator);
                     
                     set_text(row_num, RESULTS_COLUMN_CREATOR, creator);
                     xmlFree(xml_creator);
                 }
-                else if (!strcmp((const char*)cur_node->name, "description"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "description"))
                 {
                     xmlChar *xml_description = xmlNodeGetContent(cur_node);
                     //char* final_description;
-                    char* stripped_description = g_strstrip((char*) xml_description);
+                    char* stripped_description = g_strstrip(reinterpret_cast<char*>(xml_description));
 
                     if (!strcmp(stripped_description, "")) {
                         stripped_description = _("No description");
@@ -1002,30 +1002,30 @@ void SearchResultList::populate_from_xml(xmlNode * a_node)
                     set_text(row_num, RESULTS_COLUMN_DESCRIPTION, stripped_description);
                     xmlFree(xml_description);
                 }
-                else if (!strcmp((const char*)cur_node->name, "enclosure"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "enclosure"))
                 {
-                    xmlChar *xml_url = xmlGetProp(cur_node, (xmlChar*) "url");
-                    char* url = (char*) xml_url;
+                    xmlChar *xml_url = xmlGetProp(cur_node, reinterpret_cast<xmlChar*>(g_strdup("url")));
+                    char* url = reinterpret_cast<char*>(xml_url);
                     char* filename = g_path_get_basename(url);
 
                     set_text(row_num, RESULTS_COLUMN_URL, url);
                     set_text(row_num, RESULTS_COLUMN_FILENAME, filename);
                     xmlFree(xml_url);
                 }
-                else if (!strcmp((const char*)cur_node->name, "thumbnail"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "thumbnail"))
                 {
-                    xmlChar *xml_thumbnail_url = xmlGetProp(cur_node, (xmlChar*) "url");
-                    char* thumbnail_url = (char*) xml_thumbnail_url;
+                    xmlChar *xml_thumbnail_url = xmlGetProp(cur_node, reinterpret_cast<xmlChar*>(g_strdup("url")));
+                    char* thumbnail_url = reinterpret_cast<char*>(xml_thumbnail_url);
                     char* thumbnail_filename = g_path_get_basename(thumbnail_url);
 
                     set_text(row_num, RESULTS_COLUMN_THUMBNAIL_URL, thumbnail_url);
                     set_text(row_num, RESULTS_COLUMN_THUMBNAIL_FILENAME, thumbnail_filename);
                     xmlFree(xml_thumbnail_url);
                 }
-                else if (!strcmp((const char*)cur_node->name, "guid"))
+                else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "guid"))
                 {
                     xmlChar *xml_guid = xmlNodeGetContent(cur_node);
-                    char* guid_url = (char*) xml_guid;
+                    char* guid_url = reinterpret_cast<char*>(xml_guid);
                     char* guid = g_path_get_basename(guid_url);
 
                     set_text(row_num, RESULTS_COLUMN_GUID, guid);
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 1ce78a278..410cdbda9 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -194,7 +194,7 @@ void TileDialog::Grid_Arrange ()
 
     g_return_if_fail(selection);
     const GSList *items2 = selection->itemList();
-    GSList *rev = g_slist_copy((GSList *) items2);
+    GSList *rev = g_slist_copy(const_cast<GSList *>(items2));
     GSList *sorted = NULL;
     rev = g_slist_sort(rev, (GCompareFunc) sp_compare_y_position);
     sorted = g_slist_sort(rev, (GCompareFunc) sp_compare_x_position);
@@ -667,7 +667,7 @@ TileDialog::TileDialog()
     NoOfRowsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_col_spinbutton_changed));
     NoOfRowsSpinner.set_tooltip_text(_("Number of rows"));
     NoOfRowsBox.pack_start(NoOfRowsSpinner, false, false, MARGIN);
-    gtk_size_group_add_widget(_col1, (GtkWidget *) NoOfRowsBox.gobj());
+    gtk_size_group_add_widget(_col1, GTK_WIDGET(NoOfRowsBox.gobj()));
 
     RowHeightButton.set_label(_("Equal _height"));
     RowHeightButton.set_use_underline(true);
@@ -724,7 +724,7 @@ TileDialog::TileDialog()
     XByYLabel.set_markup(" &#215; ");
     XByYLabelVBox.pack_start(XByYLabel, false, false, MARGIN);
     SpinsHBox.pack_start(XByYLabelVBox, false, false, MARGIN);
-    gtk_size_group_add_widget(_col2, (GtkWidget *) XByYLabelVBox.gobj());
+    gtk_size_group_add_widget(_col2, GTK_WIDGET(XByYLabelVBox.gobj()));
 
     /*#### Number of columns ####*/
 
@@ -739,7 +739,7 @@ TileDialog::TileDialog()
     NoOfColsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_row_spinbutton_changed));
     NoOfColsSpinner.set_tooltip_text(_("Number of columns"));
     NoOfColsBox.pack_start(NoOfColsSpinner, false, false, MARGIN);
-    gtk_size_group_add_widget(_col3, (GtkWidget *) NoOfColsBox.gobj());
+    gtk_size_group_add_widget(_col3, GTK_WIDGET(NoOfColsBox.gobj()));
 
     ColumnWidthButton.set_label(_("Equal _width"));
     ColumnWidthButton.set_use_underline(true);
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 567608ef8..1c36dc36e 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -117,7 +117,7 @@ bool ImageIcon::showSvgDocument(const SPDocument *docArg)
     viewerGtkmm->show();
     pack_start(*viewerGtkmm, TRUE, TRUE, 0);
 
-    //GtkWidget *vbox = (GtkWidget *)gobj();
+    //GtkWidget *vbox = GTK_WIDGET(gobj());
     //gtk_box_pack_start(GTK_BOX(vbox), viewerGtk, TRUE, TRUE, 0);
 
     return true;
@@ -306,7 +306,7 @@ void ImageIcon::showBrokenImage(const Glib::ustring &errorMessage)
         "</svg>";
 
     //Fill in the template
-    char *cErrorMessage = (char *)errorMessage.c_str();
+    char *cErrorMessage = const_cast<char *>(errorMessage.c_str());
     gchar *xmlBuffer = g_strdup_printf(xformat, cErrorMessage);
 
     //g_message("%s\n", xmlBuffer);
@@ -375,7 +375,7 @@ bool ImageIcon::show(const Glib::ustring &fileName)
     if (!Glib::file_test(fileName, Glib::FILE_TEST_EXISTS))
         return false;
 
-    gchar *fName = (gchar *)fileName.c_str();
+    gchar *fName = const_cast<gchar *>(fileName.c_str());
     //g_message("fname:%s\n", fName);
 
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 2789676ea..537db0fdd 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -89,8 +89,8 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
     /* SizeGroup keeps the blur and opacity labels aligned in Fill & Stroke dlg */
 /*
     GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-    gtk_size_group_add_widget(labels, (GtkWidget *) _opacity_label.gobj());
-    gtk_size_group_add_widget(labels, (GtkWidget *) _fe_cb.get_blur_label()->gobj());
+    gtk_size_group_add_widget(labels, GTK_WIDGET(_opacity_label.gobj()));
+    gtk_size_group_add_widget(labels, GTK_WIDGET(_fe_cb.get_blur_label()->gobj()));
 */
 
     show_all_children();