summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2019-01-19 21:59:02 +0000
committerTavmjong Bah <tavmjong@free.fr>2019-01-19 21:59:02 +0000
commit5eb90c30295222a5a8a9584c8fe9e681a1b608f4 (patch)
treea47a047f044bafb44a616de84492df8c4087ecb3 /src
parentRemove sp_create_window(). (diff)
downloadinkscape-5eb90c30295222a5a8a9584c8fe9e681a1b608f4.tar.gz
inkscape-5eb90c30295222a5a8a9584c8fe9e681a1b608f4.zip
Get rid of unneccessary type conversions (SPDesktopWidget <-> SPViewWidget).
Diffstat (limited to 'src')
-rw-r--r--src/inkscape-window.cpp3
-rw-r--r--src/widgets/desktop-widget.cpp5
-rw-r--r--src/widgets/desktop-widget.h4
3 files changed, 5 insertions, 7 deletions
diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index be8737c8f..9c6fbcb84 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -61,8 +61,7 @@ InkscapeWindow::InkscapeWindow(SPDocument* document)
// Menu bar
// Desktop widget (=> MultiPaned)
- SPViewWidget* _vw = sp_desktop_widget_new(sp_document_namedview(document, nullptr));
- _desktop_widget = reinterpret_cast<SPDesktopWidget*>(_vw);
+ _desktop_widget = sp_desktop_widget_new(sp_document_namedview(document, nullptr));
gtk_container_add(GTK_CONTAINER(_mainbox->gobj()), GTK_WIDGET(_desktop_widget));
gtk_widget_show(GTK_WIDGET(_desktop_widget));
_desktop = _desktop_widget->desktop;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 24fae76f6..6c588dc59 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1636,11 +1636,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp
}
-SPViewWidget *sp_desktop_widget_new( SPNamedView *namedview )
+SPDesktopWidget *sp_desktop_widget_new( SPNamedView *namedview )
{
SPDesktopWidget* dtw = SPDesktopWidget::createInstance(namedview);
-
- return SP_VIEW_WIDGET(dtw);
+ return dtw;
}
SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index fb59e173e..44d8fa349 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -63,9 +63,9 @@ class SelectedStyle;
#define SP_IS_DESKTOP_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_DESKTOP_WIDGET))
/**
- * Create a new SPViewWidget (which happens to be a SPDesktopWidget).
+ * Create a new SPDesktopWidget
*/
-SPViewWidget *sp_desktop_widget_new(SPNamedView *namedview);
+SPDesktopWidget *sp_desktop_widget_new(SPNamedView *namedview);
void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean show);
void sp_desktop_widget_update_hruler (SPDesktopWidget *dtw);