More small fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1058 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index f3430be70e79568f1e18626336413468019b29f9..56836104232f965abb7bb2b65f00887a03407c65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-09-29  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lib/images/*: rename a bunch of icons to match Dekel converter
+       changes. 
+
+       * src/buffer.C (SimpleLinuxDocOnePar): add a const qualifier to
+       last parameter.
+
+       * src/frontends/xforms/FormBase.C (disconnect): remove bogus test. 
+
+       * sigc++/macros/basic_signal.h.m4: fix class Signal_ to have a
+       virtual destructor
+       * sigc++/handle.h: ditto for class Handle. 
+
 2000-09-27  John Levon  <moz@compsoc.man.ac.uk>
 
        * config/kde.m4: make Qt fail immediately if Qt2 is picked up

diff --git a/lib/images/buffer-typeset-ps.xpm b/lib/images/buffer-typeset-ps.xpm
deleted file mode 100644 (file)
index 1c8c0a2..0000000
--- a/lib/images/buffer-typeset-ps.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char const * update_ps_xpm[] = {
-"20 20 3 1",
-" c None",
-".c navy",
-"Xc black",
-"        ...         ",
-"      ........      ",
-"    ..... .....     ",
-"   ...       ...    ",
-"  ...         ...   ",
-" ...           ...  ",
-" ..  XXX   XX   ..  ",
-" ..  X  X X  X  ..  ",
-"...  X  X X     ... ",
-"..   XXX   XX    .. ",
-"...  X       X  ... ",
-" ..  X    X  X  ..  ",
-" ..  X     XX   ..  ",
-" ...           ...  ",
-"  ...      .. ...   ",
-"   ...     .....    ",
-"    .      ....     ",
-"           .....    ",
-"           .....    ",
-"                    "};

diff --git a/lib/images/buffer-typeset.xpm b/lib/images/buffer-typeset.xpm
deleted file mode 100644 (file)
index 5246631..0000000
--- a/lib/images/buffer-typeset.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char const * run_latex_xpm[] = {
-"20 20 2 1",
-"      c None",
-".     c #000000000000",
-"                    ",
-"  . .. .  . . ..    ",
-"  ..   .  . ..  .   ",
-"  .    .  . .   .   ",
-"  .     ..  .   .   ",
-"                    ",
-"                    ",
-" .      .....  .   .",
-" .        .     . . ",
-" .        .     . . ",
-" .    ..  . ...  .  ",
-" .   .  . . .   . . ",
-" .   .  . . .   . . ",
-" ... .  . . .. .   .",
-"     ....   .       ",
-"     .  .   .       ",
-"     .  .   ...     ",
-"                    ",
-"                    ",
-"                    "};
-
-
-

diff --git a/lib/images/buffer-update_dvi.xpm b/lib/images/buffer-update_dvi.xpm
new file mode 100644 (file)
index 0000000..5246631
--- /dev/null
+++ b/lib/images/buffer-update_dvi.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char const * run_latex_xpm[] = {
+"20 20 2 1",
+"      c None",
+".     c #000000000000",
+"                    ",
+"  . .. .  . . ..    ",
+"  ..   .  . ..  .   ",
+"  .    .  . .   .   ",
+"  .     ..  .   .   ",
+"                    ",
+"                    ",
+" .      .....  .   .",
+" .        .     . . ",
+" .        .     . . ",
+" .    ..  . ...  .  ",
+" .   .  . . .   . . ",
+" .   .  . . .   . . ",
+" ... .  . . .. .   .",
+"     ....   .       ",
+"     .  .   .       ",
+"     .  .   ...     ",
+"                    ",
+"                    ",
+"                    "};
+
+
+

diff --git a/lib/images/buffer-update_ps.xpm b/lib/images/buffer-update_ps.xpm
new file mode 100644 (file)
index 0000000..1c8c0a2
--- /dev/null
+++ b/lib/images/buffer-update_ps.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char const * update_ps_xpm[] = {
+"20 20 3 1",
+" c None",
+".c navy",
+"Xc black",
+"        ...         ",
+"      ........      ",
+"    ..... .....     ",
+"   ...       ...    ",
+"  ...         ...   ",
+" ...           ...  ",
+" ..  XXX   XX   ..  ",
+" ..  X  X X  X  ..  ",
+"...  X  X X     ... ",
+"..   XXX   XX    .. ",
+"...  X       X  ... ",
+" ..  X    X  X  ..  ",
+" ..  X     XX   ..  ",
+" ...           ...  ",
+"  ...      .. ...   ",
+"   ...     .....    ",
+"    .      ....     ",
+"           .....    ",
+"           .....    ",
+"                    "};

diff --git a/lib/images/buffer-view-ps.xpm b/lib/images/buffer-view-ps.xpm
deleted file mode 100644 (file)
index 6d9ec40..0000000
--- a/lib/images/buffer-view-ps.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char const * view_ps_xpm[] = {
-"20 20 2 1",
-"      c None",
-".     c #000000000000",
-"                    ",
-"     .............. ",
-"     .            . ",
-"   ...            . ",
-" ... .            . ",
-" . . . ...    ..  . ",
-" . . . .  .  .    . ",
-" . . . .  .   .   . ",
-" . . . .  .    .  . ",
-" . . . ...   ..   . ",
-" . . . .          . ",
-" . . . .          . ",
-" . . . .          . ",
-" . . .            . ",
-" . . .............. ",
-" . .            .   ",
-" . ..............   ",
-" .            .     ",
-" ..............     ",
-"                    "};
-
-
-

diff --git a/lib/images/buffer-view.xpm b/lib/images/buffer-view.xpm
deleted file mode 100644 (file)
index 79dc0b2..0000000
--- a/lib/images/buffer-view.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char const * view_dvi_xpm[] = {
-"20 20 2 1",
-"      c None",
-".     c #000000000000",
-"                    ",
-"     .............. ",
-"     .            . ",
-"   ...            . ",
-" ... .            . ",
-" . . .            . ",
-" . . .    .     . . ",
-" . . .    .     . . ",
-" . . .    .       . ",
-" . . .  ... . . . . ",
-" . . . .  . . . . . ",
-" . . . .  . . . . . ",
-" . . .  ...  .  . . ",
-" . . .            . ",
-" . . .............. ",
-" . .            .   ",
-" . ..............   ",
-" .            .     ",
-" ..............     ",
-"                    "};
-
-
-

diff --git a/lib/images/buffer-view_dvi.xpm b/lib/images/buffer-view_dvi.xpm
new file mode 100644 (file)
index 0000000..79dc0b2
--- /dev/null
+++ b/lib/images/buffer-view_dvi.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char const * view_dvi_xpm[] = {
+"20 20 2 1",
+"      c None",
+".     c #000000000000",
+"                    ",
+"     .............. ",
+"     .            . ",
+"   ...            . ",
+" ... .            . ",
+" . . .            . ",
+" . . .    .     . . ",
+" . . .    .     . . ",
+" . . .    .       . ",
+" . . .  ... . . . . ",
+" . . . .  . . . . . ",
+" . . . .  . . . . . ",
+" . . .  ...  .  . . ",
+" . . .            . ",
+" . . .............. ",
+" . .            .   ",
+" . ..............   ",
+" .            .     ",
+" ..............     ",
+"                    "};
+
+
+

diff --git a/lib/images/buffer-view_ps.xpm b/lib/images/buffer-view_ps.xpm
new file mode 100644 (file)
index 0000000..6d9ec40
--- /dev/null
+++ b/lib/images/buffer-view_ps.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char const * view_ps_xpm[] = {
+"20 20 2 1",
+"      c None",
+".     c #000000000000",
+"                    ",
+"     .............. ",
+"     .            . ",
+"   ...            . ",
+" ... .            . ",
+" . . . ...    ..  . ",
+" . . . .  .  .    . ",
+" . . . .  .   .   . ",
+" . . . .  .    .  . ",
+" . . . ...   ..   . ",
+" . . . .          . ",
+" . . . .          . ",
+" . . . .          . ",
+" . . .            . ",
+" . . .............. ",
+" . .            .   ",
+" . ..............   ",
+" .            .     ",
+" ..............     ",
+"                    "};
+
+
+

diff --git a/sigc++/handle.h b/sigc++/handle.h
index 68576389b7e1e7369cd08892749cd16e96721c3e..cbacccf4839d00eb8f010ad711f4d7b74aed7ace 100644 (file)
--- a/sigc++/handle.h
+++ b/sigc++/handle.h
@@ -84,6 +84,10 @@ template <class Obj,class Scope_>
         Obj *o=handle.obj();
         scope_.set(o,o,false);
        }
+
+     // virtual destructor
+     virtual ~Handle() {}
+     
   };
 
 #define HANDLE_CTORS(X,T,P)                  \

diff --git a/sigc++/macros/basic_signal.h.m4 b/sigc++/macros/basic_signal.h.m4
index 3dfddad94e18ed9c9ac52e9a7f6173c9809aadc2..5b5eb6af7946359a1585ec50154e286de22519cf 100644 (file)
--- a/sigc++/macros/basic_signal.h.m4
+++ b/sigc++/macros/basic_signal.h.m4
@@ -61,7 +61,7 @@ class LIBSIGC_API Signal_
       SlotData* out_connect(SlotData *s);
 
       Signal_();
-      ~Signal_();
+      virtual ~Signal_();
 
     public:
       bool empty() const;

diff --git a/src/buffer.C b/src/buffer.C
index ae13856bad164c32de4ff17e484649ce9f854b78..a8f510ba1af615cc6b633fd73a95cc7df7ba14ba 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2706,7 +2706,7 @@ void linux_doc_line_break(ostream & os, string::size_type & colcount,
 
 
 void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
-                                 int desc_on, int /*depth*/)
+                                 int desc_on, int const /*depth*/)
 {
        LyXFont font1;
        char c;

diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index 90b77d7b799a82d5af8522ed7a09cf83feeca006..5239d69125020e30a59a8bb0c60a8a0fb4814600 100644 (file)
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -93,9 +93,7 @@ void FormBase::connect()
 
 void FormBase::disconnect()
 {
-       if (u_) {
-               u_.disconnect();
-       }
+       u_.disconnect();
        h_.disconnect();
 }