summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/imageicon.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-12-25 22:50:08 +0000
committerAlex Valavanis <valavanisalex@googlemail.com>2012-12-25 22:50:08 +0000
commit8ee9827502fadcae0b02fec434799e94ee115357 (patch)
treea2cac37646ad35f34b9eef93d3247e5468b66032 /src/ui/widget/imageicon.cpp
parentStop using UNUSED_PIXELS hack in ruler. This was only required because of th... (diff)
downloadinkscape-8ee9827502fadcae0b02fec434799e94ee115357.tar.gz
inkscape-8ee9827502fadcae0b02fec434799e94ee115357.zip
Convert a load more C-style pointer casts to GObject or C++ casts (merry christmas\!)
(bzr r11986)
Diffstat (limited to 'src/ui/widget/imageicon.cpp')
-rw-r--r--src/ui/widget/imageicon.cpp6
1 files changed, 3 insertions, 3 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);