Index: /tools/SkyQualityMonitor/sqm.cpp
===================================================================
--- /tools/SkyQualityMonitor/sqm.cpp	(revision 216)
+++ /tools/SkyQualityMonitor/sqm.cpp	(revision 217)
@@ -3,5 +3,5 @@
   Interface to the sky quality monitor (essentially a socket interface)
   
-  Terminate with CTRL-c. Note that socket is closed automatically by exit().
+  Terminate with CTRL-c. Socket is closed automatically by exit().
   
   Oliver Grimm, September 2009
@@ -39,5 +39,5 @@
   // Open socket descriptor
   if ((SocketDescriptor = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
-    Srv.State(Srv.FATAL, "Could not open socket (%s)", strerror(errno));
+    Srv.Message(Srv.FATAL, "Could not open socket (%s)", strerror(errno));
   }
     
@@ -45,5 +45,5 @@
   struct hostent *hostent = gethostbyname(Address);
   if (hostent==0) {
-    Srv.State(Srv.FATAL, "Could not resolve host name '%s' (%s)", Address, hstrerror(h_errno));
+    Srv.Message(Srv.FATAL, "Could not resolve host name '%s' (%s)", Address, hstrerror(h_errno));
   }
 
@@ -54,8 +54,8 @@
   
   if (connect(SocketDescriptor, (struct sockaddr *) &SocketAddress, sizeof(SocketAddress))==-1) {
-    Srv.State(Srv.FATAL, "Could not connect to server '%s' on port %d (%s)", Address, Port, strerror(errno));
+    Srv.Message(Srv.FATAL, "Could not connect to server '%s' on port %d (%s)", Address, Port, strerror(errno));
   }
 
-  Srv.State(Srv.INFO, "Connected to server '%s' on port %d", Address, Port);
+  Srv.Message(Srv.INFO, "Connected to server '%s' on port %d", Address, Port);
   signal(SIGPIPE,SIG_IGN);  // Do not kill process if writing to closed socket
 
@@ -73,5 +73,5 @@
     // Write read command to socket
     if ((write(SocketDescriptor, READ_CMD, strlen(READ_CMD)))<1) { 
-      Srv.State(Srv.ERROR, "Could not write read command '%s' to socket.", READ_CMD);
+      Srv.Message(Srv.ERROR, "Could not write read command '%s' to socket.", READ_CMD);
     }
     
@@ -82,9 +82,9 @@
     struct timeval WaitTime = {Period, 0};
     if (select(((int) SocketDescriptor)+1, &ReadFileDescriptor, NULL, NULL, &WaitTime)==-1) {
-      Srv.State(Srv.FATAL, "Error with select() (%s)", strerror(errno));
+      Srv.Message(Srv.FATAL, "Error with select() (%s)", strerror(errno));
     }
 
     if (!FD_ISSET(SocketDescriptor, &ReadFileDescriptor)) { 
-      Srv.State(Srv.WARN, "Time-out of %d seconds expired before receiving response from socket", Period);
+      Srv.Message(Srv.WARN, "Time-out of %d seconds expired before receiving response from socket", Period);
       continue;
     }
@@ -92,5 +92,5 @@
     memset(Buffer, 0, BUF_SIZE);
     if(read(SocketDescriptor, Buffer, BUF_SIZE) == 0) {
-      Srv.State(Srv.FATAL, "Server not existing anymore, exiting...\n");
+      Srv.Message(Srv.FATAL, "Server not existing anymore, exiting...\n");
     }