rename Inset to InsetOld

[lyx.git] / src / counters.h

diff --git a/src/counters.h b/src/counters.h
index 680005962c770c5aaef16663220efcfa03589fbf..da7bf4467d6728aaafcdb182adb9636d1c064c94 100644 (file)
--- a/src/counters.h
+++ b/src/counters.h
@@ -14,13 +14,9 @@
 #ifndef COUNTERS_H
 #define COUNTERS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
 #include <map>
-#include <vector>
+
 
 /// This represents a single counter.
 class Counter {
@@ -41,25 +37,20 @@ public:
        string master() const;
        /// sets the master counter for this counter
        void setMaster(string const & m);
-       ///
-
 private:
+       ///
        int value_;
-       /// contains master counter name; master counter is the counter 
-       /// that, if stepped (incremented) zeroes this counter. E.g. 
+       /// contains master counter name; master counter is the counter
+       /// that, if stepped (incremented) zeroes this counter. E.g.
        /// "subparagraph"'s master is "paragraph".
        string master_;
 };
 
 
-/// This is a class of (La)TeX type counters. 
+/// This is a class of (La)TeX type counters.
 /// Every instantiation is an array of counters of type Counter.
 class Counters {
 public:
-       ///
-       Counters();
-       ///     
-       //~Counters();
        /// Add a new counter to array.
        void newCounter(string const & newc);
        /// Add new counter having oldc as its master.
@@ -75,30 +66,27 @@ public:
        /// NOTE sub-slaves not zeroed! That happens at slave's
        /// first step 0->1. Seems to be sufficient.
        void step(string const & ctr);
-       /// Reset counters matched by match string. Empty string matches
-       /// all.
-       void reset(string const & match = string());
-       /// Copy counters whose name matches match from the &from to 
+       /// Reset all counters.
+       void reset();
+       /// Reset counters matched by match string.
+       void reset(string const & match);
+       /// Copy counters whose name matches match from the &from to
        /// the &to array of counters. Empty string matches all.
        void copy(Counters & from, Counters & to, string const & match = string());
        /// A numeric label's single item, like .1 for subsection number in
        /// the 2.1.4 subsubsection number label. "first" indicates if this
        /// is the first item to be displayed, usually chapter or section.
        string labelItem(string const & ctr,
-                       string const & labeltype, 
+                       string const & labeltype,
                        string const & langtype = "latin",
                        bool first = false);
        /// A complete numeric label, like 2.1.4 for a subsubsection.
        /// "head" indicates sequence number of first item to be
        /// displayed, e.g. 0 for chapter, 1 for section.
        string numberLabel(string const & ctr,
-                       string const & labeltype, 
+                       string const & labeltype,
                        string const & langtype = "latin",
                        int head = 0);
-       /// Maps numbers to enumeration of sectioning counter name strings.
-       std::vector<string> enums;
-       std::vector<string> sects;
-       
 private:
        /// Maps counter (layout) names to actual counters.
        typedef std::map<string, Counter> CounterList;