From e36b55fc22df7631393784974077c5f7a1b00e67 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 4 Nov 2007 01:01:15 +0000
Subject: Add virtual to a lot of the destructors. Note: perhaps it will have
 to be reverted for some files to keep them C-compatible.

(bzr r4024)
---
 src/libnrtype/FontFactory.h               | 2 +-
 src/libnrtype/Layout-TNG-Scanline-Maker.h | 4 ++--
 src/libnrtype/RasterFont.h                | 2 +-
 src/libnrtype/TextWrapper.h               | 2 +-
 src/libnrtype/font-instance.h             | 2 +-
 src/libnrtype/font-lister.h               | 2 +-
 src/libnrtype/raster-glyph.h              | 2 +-
 src/libnrtype/raster-position.h           | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h
index 2b4c6be0f..ba0010246 100644
--- a/src/libnrtype/FontFactory.h
+++ b/src/libnrtype/FontFactory.h
@@ -71,7 +71,7 @@ public:
     __gnu_cxx::hash_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> loadedFaces;
 
     font_factory();
-    ~font_factory();
+    virtual ~font_factory();
 
     /// Returns the default font_factory.
     static font_factory*  Default();
diff --git a/src/libnrtype/Layout-TNG-Scanline-Maker.h b/src/libnrtype/Layout-TNG-Scanline-Maker.h
index 3865e2c12..f0783c149 100755
--- a/src/libnrtype/Layout-TNG-Scanline-Maker.h
+++ b/src/libnrtype/Layout-TNG-Scanline-Maker.h
@@ -87,7 +87,7 @@ class Layout::InfiniteScanlineMaker : public Layout::ScanlineMaker
 {
 public:
     InfiniteScanlineMaker(double initial_x, double initial_y, Layout::Direction block_progression);
-    ~InfiniteScanlineMaker();
+    virtual ~InfiniteScanlineMaker();
 
     /** Returns a single infinite run at the current location */
     virtual std::vector<ScanRun> makeScanline(Layout::LineHeight const &line_height);
@@ -120,7 +120,7 @@ class Layout::ShapeScanlineMaker : public Layout::ScanlineMaker
 {
 public:
     ShapeScanlineMaker(Shape const *shape, Layout::Direction block_progression);
-    ~ShapeScanlineMaker();
+    virtual ~ShapeScanlineMaker();
 
     virtual std::vector<ScanRun> makeScanline(Layout::LineHeight const &line_height);
 
diff --git a/src/libnrtype/RasterFont.h b/src/libnrtype/RasterFont.h
index 10de23d1b..268b7c58f 100644
--- a/src/libnrtype/RasterFont.h
+++ b/src/libnrtype/RasterFont.h
@@ -30,7 +30,7 @@ public:
     raster_glyph**                bases;
 
     explicit raster_font(font_style const &fstyle);
-    ~raster_font(void);
+    virtual ~raster_font(void);
    
     void                          Unref(void);
     void                          Ref(void);
diff --git a/src/libnrtype/TextWrapper.h b/src/libnrtype/TextWrapper.h
index 188f04ee1..e3b3272a6 100644
--- a/src/libnrtype/TextWrapper.h
+++ b/src/libnrtype/TextWrapper.h
@@ -64,7 +64,7 @@ public:
     one_para *paras;
 
     text_wrapper(void);
-    ~text_wrapper(void);
+    virtual ~text_wrapper(void);
 
     // filling the structure with input data
     void SetDefaultFont(font_instance *iFont);
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 4bec0203d..22dd829ae 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -50,7 +50,7 @@ public:
     font_glyph*           glyphs;
 
     font_instance(void);
-    ~font_instance(void);
+    virtual ~font_instance(void);
 
     void                 Ref(void);
     void                 Unref(void);
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index fb0810254..39953c11c 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -35,7 +35,7 @@ namespace Inkscape
                         };
 
 
-                        ~FontLister ();
+                        virtual ~FontLister ();
 
                         /** GtkTreeModelColumnRecord for the font list Gtk::ListStore
                          */
diff --git a/src/libnrtype/raster-glyph.h b/src/libnrtype/raster-glyph.h
index e39cc4e41..d8a85a4a1 100644
--- a/src/libnrtype/raster-glyph.h
+++ b/src/libnrtype/raster-glyph.h
@@ -23,7 +23,7 @@ public:
     raster_position*  sub_pixel;
 
     raster_glyph(void);
-    ~raster_glyph(void);
+    virtual ~raster_glyph(void);
 
 		// utility
     void      SetSubPixelPositionning(int nb_pos);
diff --git a/src/libnrtype/raster-position.h b/src/libnrtype/raster-position.h
index ef12b93ec..744b6dddd 100644
--- a/src/libnrtype/raster-position.h
+++ b/src/libnrtype/raster-position.h
@@ -23,7 +23,7 @@ public:
 
 public:
     raster_position();
-    ~raster_position();
+    virtual ~raster_position();
 
 		// stuff runs into the structure
     void AppendRuns(std::vector<float_ligne_run> const &r, int y);
-- 
cgit v1.2.3