fixes because of SUN CC warnings, bmtable now compiled with C compilator, countChar...

[lyx.git] / src / insets / insetcommand.h

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 1657ce931cb6a463f7d5fd0b59d9b4da691b4a01..e26abaf50e0827a5aa27477f89e763c4c279ee39 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -1,16 +1,16 @@
 // -*- C++ -*-
 /* This file is part of*
- * ======================================================
+ * ====================================================== 
  *
  *           LyX, The Document Processor
  *      
  *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1996-1998 The LyX Team.
+ *          Copyright (C) 1996-1999 The LyX Team.
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_LATEXCOMMAND_H
-#define _INSET_LATEXCOMMAND_H
+#ifndef INSET_LATEXCOMMAND_H
+#define INSET_LATEXCOMMAND_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -33,31 +33,29 @@ public:
        InsetCommand(string const & name, string const & arg = string(), 
                     string const & opt = string());
        ///
-       ~InsetCommand();
+       int Ascent(LyXFont const & font) const;
        ///
-       int Ascent(LyXFont const &font) const;
+       int Descent(LyXFont const & font) const;
        ///
-       int Descent(LyXFont const &font) const;
+       int Width(LyXFont const & font) const;
        ///
-       int Width(LyXFont const &font) const;
+       void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
        ///
-       void Draw(LyXFont, LyXScreen &scr, int baseline, float &x);
-       ///
-       void Write(FILE *file);
+       void Write(ostream &);
        /// Parse the command.
-       void scanCommand(string const &cmd);
+       void scanCommand(string const & cmd);
        /// Will not be used when lyxf3
-       void Read(LyXLex &lex);
+       void Read(LyXLex & lex);
        /// 
-       virtual int Latex(FILE *file, signed char fragile);
+       virtual int Latex(ostream &, signed char fragile);
        ///
-       virtual int Latex(string &file, signed char fragile);
+       virtual int Latex(string & file, signed char fragile);
        ///
-       virtual int Linuxdoc(string &file);
+       virtual int Linuxdoc(string & file);
        ///
-       virtual int DocBook(string &file);
+       virtual int DocBook(string & file);
        ///
-       Inset* Clone();
+       Inset * Clone() const;
        ///  
        Inset::Code LyxCode() const
        {
@@ -78,15 +76,15 @@ public:
        /// Build the complete LaTeX command
        string getCommand() const;
        ///
-       string const &getCmdName() const {
+       string const & getCmdName() const {
                return command;
        }
        ///
-       string const &getOptions() const {
+       string const & getOptions() const {
                return options;
        }
        ///
-       string const &getContents() const {
+       string const & getContents() const {
                return contents;
        }
        ///