Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / counters.h

diff --git a/src/counters.h b/src/counters.h
index fcfeef73dc30be5a64b92f942eda41789d71d2d9..9d50608493b22dddc44b46386e92feccb25486eb 100644 (file)
--- a/src/counters.h
+++ b/src/counters.h
@@ -12,7 +12,7 @@
 
 
 #ifndef COUNTERS_H
-#define COUTNERS_H
+#define COUNTERS_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -22,14 +22,8 @@
 #include <sigc++/signal_system.h>
 #include "LString.h"
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Object;
-using SigC::Signal0;
-#endif
-
-
 ///
-class Counter : public Object {
+class Counter : public SigC::Object {
 public:
        ///
        Counter();
@@ -44,7 +38,7 @@ public:
        ///
        void reset();
        ///
-       Signal0<void> onstep;
+       SigC::Signal0<void> onstep;
 private:
        ///
        int value_;