fix bug 2089: Touching Navigate menu crashes Lyx when a TOC inset is in a section...

[lyx.git] / src / tex-accent.C

diff --git a/src/tex-accent.C b/src/tex-accent.C
index bcbeff0399df1b73da3bdf0444c43e30545d39e2..ddfa1a7dfb8b8f87fdc229b5890fc170827eb512 100644 (file)
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -1,24 +1,22 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file tex-accent.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <cstdlib>
 #include "tex-accent.h"
-#include "commandtags.h"
-#include "LString.h"
-#include "support/lstrings.h"
+#include "support/convert.h"
+
+#include <string>
+
+using std::string;
 
 /* the names used by TeX and XWindows for deadkeys/accents are not the same
    so here follows a table to clearify the differences. Please correct this
@@ -75,7 +73,7 @@ tex_accent_struct lyx_accent_table[18] = {
 tex_accent_struct get_accent(kb_action action)
 {
        int i = 0;
-       while (i <= TEX_MAX_ACCENT){
+       while (i <= TEX_MAX_ACCENT) {
                if (lyx_accent_table[i].action == action)
                        return lyx_accent_table[i];
                ++i;
@@ -89,7 +87,7 @@ tex_accent_struct get_accent(kb_action action)
 string const DoAccent(string const & s, tex_accent accent)
 {
        string res;
-       
+
        res += lyx_accent_table[accent].cmd;
        res += '{';
        if (s == "i" || s == "j") {
@@ -103,6 +101,5 @@ string const DoAccent(string const & s, tex_accent accent)
 
 string const DoAccent(char c, tex_accent accent)
 {
-       return DoAccent(tostr(c), accent);
+       return DoAccent(convert<string>(c), accent);
 }
-