More 'standard conformant blurb' nonsense.

[lyx.git] / src / counters.C

diff --git a/src/counters.C b/src/counters.C
index 8203a98ceaec6583467fdeae9b4404d1c6af576a..a69b6a3c086e692148f6455af0ca56355fc70e68 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -9,18 +9,17 @@
  *
  * ====================================================== */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "counters.h"
 #include "debug.h"
+#include "Lsstream.h"
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 
+using namespace lyx::support;
+
 using std::endl;
 using std::vector;
 
@@ -172,7 +171,7 @@ void Counters::reset()
 
 void Counters::reset(string const & match)
 {
-       lyx::Assert(!match.empty());
+       Assert(!match.empty());
 
        CounterList::iterator it = counterList.begin();
        CounterList::iterator end = counterList.end();
@@ -261,11 +260,11 @@ string Counters::labelItem(string const & ctr,
        CounterList::iterator it = counterList.find(ctr);
        if (it == counterList.end()) {
                lyxerr << "Counter does not exist." << endl;
-               return "";
+               return string();
        }
 
        if (!first) {
-               s << "." << value(ctr);
+               s << '.' << value(ctr);
        } else {
                if (numbertype == "sectioning" || numbertype == "appendix") {
                        if (numbertype == "appendix") {
@@ -278,7 +277,8 @@ string Counters::labelItem(string const & ctr,
                }
                s << o.str();
        }
-       return s.str();
+
+       return STRCONV(s.str());
 }
 
 
@@ -287,7 +287,8 @@ string Counters::numberLabel(string const & ctr,
                             string const & langtype,
                             int head)
 {
-       ostringstream s, o;
+       ostringstream s;
+
        if (numbertype == "sectioning" || numbertype == "appendix") {
                if (ctr == "chapter" && head == 0) {
                        s << labelItem("chapter", numbertype, langtype, true);
@@ -340,5 +341,6 @@ string Counters::numberLabel(string const & ctr,
                        s << eiv.str();
                }
        }
-       return s.str();
+
+       return STRCONV(s.str());
 }