parch from Herbert

[lyx.git] / src / counters.C

diff --git a/src/counters.C b/src/counters.C
index a9a89aef2878f182938c8763183cdd2bebdd9750..af660bf46d8a510cad9686d87a8a1b63cf83ab5a 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *
  * ====================================================== */
@@ -18,11 +18,6 @@
 #include "counters.h"
 #include "debug.h"
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
-
 using std::endl;
 
 
@@ -63,21 +58,21 @@ void Counter::reset()
 }
 
 
-Counters::~Counters() 
+Counters::~Counters()
 {
        // We need this since we store the Counter's as pointers in
        // the counterList.
        for (CounterList::iterator it = counterList.begin();
             it != counterList.end();
             ++it)
-               delete (*it).second;
+               delete it->second;
 }
 
 
 void Counters::newCounter(string const & newc)
 {
        // First check if newc already exist
-       CounterList::const_iterator cit = counterList.find(newc);
+       CounterList::iterator cit = counterList.find(newc);
        // if alrady exist give warning and return
        if (cit != counterList.end()) {
                lyxerr << "The new counter already exist." << endl;
@@ -90,7 +85,7 @@ void Counters::newCounter(string const & newc)
 void Counters::newCounter(string const & newc, string const & oldc)
 {
        // First check if newc already exist
-       CounterList::const_iterator cit = counterList.find(newc);
+       CounterList::iterator cit = counterList.find(newc);
        // if already existant give warning and return
        if (cit != counterList.end()) {
                lyxerr << "The new counter already exist." << endl;
@@ -105,20 +100,20 @@ void Counters::newCounter(string const & newc, string const & oldc)
        }
 
        Counter * tmp = new Counter;
-       (*it).second->onstep.connect(slot(tmp,
-                                        &Counter::reset));
+       it->second->onstep.connect(SigC::slot(tmp,
+                                             &Counter::reset));
        counterList[newc] = tmp;
 }
 
 
-void Counters::set(string const & ctr, int val) 
+void Counters::set(string const & ctr, int val)
 {
        CounterList::iterator it = counterList.find(ctr);
        if (it == counterList.end()) {
                lyxerr << "Counter does not exist." << endl;
                return;
        }
-       (*it).second->set(val);
+       it->second->set(val);
 }
 
 
@@ -129,18 +124,18 @@ void Counters::addto(string const & ctr, int val)
                lyxerr << "Counter does not exist." << endl;
                return;
        }
-       (*it).second->addto(val);
+       it->second->addto(val);
 }
 
 
-int Counters::value(string const & ctr) const 
+int Counters::value(string const & ctr) const
 {
        CounterList::const_iterator cit = counterList.find(ctr);
        if (cit == counterList.end()) {
                lyxerr << "Counter does not exist." << endl;
                return 0;
        }
-       return (*cit).second->value();
+       return cit->second->value();
 }
 
 
@@ -151,5 +146,5 @@ void Counters::step(string const & ctr)
                lyxerr << "Counter does not exist." << endl;
                return;
        }
-       (*it).second->step();
+       it->second->step();
 }