get rid of broken_header.h and some unneeded tests

[lyx.git] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index 91aeaacc41d31691f125746b82b1ca4df4f5165a..a267a87dbeaeb8a6d634a3832de8ad4150c40bd9 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -8,61 +8,61 @@
  * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
+ *
+ * Nice functions and objects to handle TOCs
  */
 
 #ifndef TOC_H
 #define TOC_H
 
-#include "support/std_string.h"
-
 #include <map>
 #include <iosfwd>
 #include <vector>
+#include <string>
 
 class Buffer;
 class LyXView;
 class Paragraph;
+class FuncRequest;
 
-/** Nice functions and objects to handle TOCs
- */
 namespace lyx {
 namespace toc {
 
 ///
 struct TocItem {
-       TocItem(int par_id, int d, string const & s)
+       TocItem(int par_id, int d, std::string const & s)
                : id_(par_id), depth(d), str(s) {}
        ///
-       string const asString() const;
+       std::string const asString() const;
        /// set cursor in LyXView to this TocItem
        void goTo(LyXView & lv_) const;
        /// the action corresponding to the goTo above
-       int action() const;
+       FuncRequest action() const;
        /// Paragraph ID containing this item
        int id_;
        /// nesting depth
        int depth;
        ///
-       string str;
+       std::string str;
 };
 
 ///
 typedef std::vector<TocItem> Toc;
 ///
-typedef std::map<string, Toc> TocList;
+typedef std::map<std::string, Toc> TocList;
 
 ///
 TocList const getTocList(Buffer const &);
 
 ///
-std::vector<string> const getTypes(Buffer const &);
+std::vector<std::string> const getTypes(Buffer const &);
 
 ///
-void asciiTocList(string const &, Buffer const &, std::ostream &);
+void asciiTocList(std::string const &, Buffer const &, std::ostream &);
 
 /** Given the cmdName of the TOC param, returns the type used
     by ControlToc::getContents() */
-string const getType(string const & cmdName);
+std::string const getType(std::string const & cmdName);
 
 inline
 bool operator==(TocItem const & a, TocItem const & b)