From 67fa2b7c2a26e909b1adb5fb188285367dfba7e4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 3 Oct 2016 23:35:23 +0200
Subject: Fix merge bugs

(bzr r15017.1.36)
---
 src/live_effects/lpe-measure-line.cpp |  5 +++++
 src/widgets/font-selector.cpp         |  7 -------
 src/widgets/font-selector.h           | 24 +-----------------------
 3 files changed, 6 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 04085015c..6e77931b0 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -161,6 +161,11 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
 
 LPEMeasureLine::~LPEMeasureLine() {}
 
+void swap(Geom::Point &A, Geom::Point &B){
+    Geom::Point tmp = A;
+    A = B;
+    B = tmp;
+}
 void
 LPEMeasureLine::doOnApply(SPLPEItem const* lpeitem)
 {
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index e9cf66621..f400de89c 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -19,10 +19,6 @@
 #include <config.h>
 #endif
 
-#include <2geom/transforms.h>
-
-#include <gtk/gtk.h>
-
 #include <libnrtype/font-lister.h>
 #include <libnrtype/font-instance.h>
 
@@ -33,7 +29,6 @@
 
 /* SPFontSelector */
 
-
 struct SPFontSelector
 {
     GtkBox hbox;
@@ -55,7 +50,6 @@ struct SPFontSelector
 };
 
 
-
 struct SPFontSelectorClass
 {
     GtkBoxClass parent_class;
@@ -251,7 +245,6 @@ static void sp_font_selector_dispose(GObject *object)
 
     if (fsel->fontspec) {
         delete fsel->fontspec;
-        fsel->fontspec = 0;
     }
 
     if (fsel->families.length > 0) {
diff --git a/src/widgets/font-selector.h b/src/widgets/font-selector.h
index e8e0af079..ff5472d2d 100644
--- a/src/widgets/font-selector.h
+++ b/src/widgets/font-selector.h
@@ -18,29 +18,7 @@
 
 #include <glib.h>
 
-struct SPFontSelector
-{
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkBox hbox;
-#else
-    GtkHBox hbox;
-#endif
-
-    unsigned int block_emit : 1;
-
-    GtkWidget *family;
-    GtkWidget *style;
-    GtkWidget *size;
-
-    GtkWidget *family_treeview;
-    GtkWidget *style_treeview;
-
-    NRNameList families;
-    NRStyleList styles;
-    gfloat fontsize;
-    bool fontsize_dirty;
-    Glib::ustring *fontspec;
-};
+struct SPFontSelector;
 
 #define SP_TYPE_FONT_SELECTOR (sp_font_selector_get_type ())
 #define SP_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector))
-- 
cgit v1.2.3