Index: trunk/FACT++/src/pwrctrl.cc
===================================================================
--- trunk/FACT++/src/pwrctrl.cc	(revision 16040)
+++ trunk/FACT++/src/pwrctrl.cc	(revision 16054)
@@ -263,13 +263,11 @@
     int GetState() const
     {
-        using namespace Power::State;
-
         // Timeout
         if (!fLastReport.IsValid() || Time()>fLastReport+boost::posix_time::seconds(fInterval*3))
-            return kDisconnected;
+            return Power::State::kDisconnected;
 
         // No data received yet
         if (!fIsValid)
-            return kConnected;
+            return Power::State::kConnected;
 
         /*
@@ -285,12 +283,12 @@
 
         if (!fStatus.fWaterLevelOk || (fStatus.fPwrPumpOn && !fStatus.fWaterFlowOk))
-            return kCoolingFailure;
+            return Power::State::kCoolingFailure;
 
         const int rc =
-            (fStatus.fPwrBiasOn       ? kBiasOn   : 0) |
-            (fStatus.fPwrPumpOn       ? kCameraOn : 0) |
-            (fStatus.fDriveFeedbackOn ? kDriveOn  : 0);
-
-        return rc==0 ? kSystemOff : rc;
+            (fStatus.fPwrBiasOn       ? Power::State::kBiasOn   : 0) |
+            (fStatus.fPwrPumpOn       ? Power::State::kCameraOn : 0) |
+            (fStatus.fDriveFeedbackOn ? Power::State::kDriveOn  : 0);
+
+        return rc==0 ? Power::State::kSystemOff : rc;
     }
 };
@@ -404,6 +402,6 @@
         const int rc = fPower.GetState();
 
-        if (rc==Power::State::kCoolingFailure && GetCurrentState()!=Power::State::kCoolingFailure)
-            Error("Power control unit reported cooling failure.");
+        if (rc==Power::State::kCoolingFailure && T::GetCurrentState()!=Power::State::kCoolingFailure)
+            T::Error("Power control unit reported cooling failure.");
 
         return fPower.GetState();