X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcounters.C;h=0fa97db461f040137e307a809a0810d7d6b6dd11;hb=8d1c58af82d1fc356f470dff97878ab7c3e8a2fe;hp=211791f981356b76490a0684be0c1b82beef2c15;hpb=d6665cba427b04ae37f42c846398cad518d2be0f;p=lyx.git

diff --git a/src/counters.C b/src/counters.C
index 211791f981..0fa97db461 100644
--- a/src/counters.C
+++ b/src/counters.C
@@ -4,7 +4,7 @@
  *           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;
 
 
@@ -70,7 +65,7 @@ Counters::~Counters()
 	for (CounterList::iterator it = counterList.begin();
 	     it != counterList.end();
 	     ++it)
-		delete (*it).second;
+		delete it->second;
 }
 
 
@@ -105,8 +100,8 @@ 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;
 }
 
@@ -118,7 +113,7 @@ void Counters::set(string const & ctr, int val)
 		lyxerr << "Counter does not exist." << endl;
 		return;
 	}
-	(*it).second->set(val);
+	it->second->set(val);
 }
 
 
@@ -129,7 +124,7 @@ void Counters::addto(string const & ctr, int val)
 		lyxerr << "Counter does not exist." << endl;
 		return;
 	}
-	(*it).second->addto(val);
+	it->second->addto(val);
 }
 
 
@@ -140,7 +135,7 @@ int Counters::value(string const & ctr) const
 		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();
 }