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

(bzr r11986)

2 files changed, 5 insertions, 5 deletions

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();