r156: *** empty log message ***

[ctsim.git] / include / trace.h

diff --git a/include/trace.h b/include/trace.h
index ed29746d1fd335de4ea2f707123d743e4259ad30..88aa2718b0690277b64b863a71f5b607a87edd19 100644 (file)
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,7 +1,7 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-enum {
+enum TraceID {
     TRACE_INVALID=-1,
     TRACE_NONE=0,              /* No tracing */
     TRACE_TEXT,                /* Minimal status */
@@ -11,53 +11,33 @@ enum {
     TRACE_CLIPPING     /* Plot clipping */
 };
 
-static const char TRACE_NONE_STR[]=     "none";
-static const char TRACE_TEXT_STR[]=     "text";
-static const char TRACE_PHM_STR[]=      "phm";
-static const char TRACE_RAYS_STR[]=     "rays";
-static const char TRACE_PLOT_STR[]=     "plot";
-static const char TRACE_CLIPPING_STR[]= "clipping";
-
 class TraceLevel
 {
  public:
-    TraceLevel (const char* const traceString);
-
-    void addTrace (const char* const traceString);
-
-    bool isTrace (const char* const traceQuery) const;
-
-    int getTraceLevel(void) const { return m_traceLevel; }
+  static const char TRACE_NONE_STR[];
+  static const char TRACE_TEXT_STR[];
+  static const char TRACE_PHM_STR[];
+  static const char TRACE_RAYS_STR[];
+  static const char TRACE_PLOT_STR[];
+  static const char TRACE_CLIPPING_STR[];
+  
+  TraceLevel (const char* const traceString);
+  
+  void addTrace (const char* const traceString);
+  
+  bool isTrace (const char* const traceQuery) const;
+  
+  int getTraceLevel(void) const { return m_traceLevel; }
+  
+  static TraceID convertTraceNameToID (const char* traceName);
 
  private:
-
-    int m_traceLevel;
-
-    bool addTraceElements (const char* const traceString);
+  
+  int m_traceLevel;
+  
+  bool addTraceElements (const char* const traceString);
 };
 
 
-inline int 
-convertTraceNameToID (const char *traceString)
-{
-  int traceID = TRACE_INVALID;
-
-  if (strcasecmp (traceString, TRACE_NONE_STR) == 0)
-    traceID = TRACE_NONE;
-  else if (strcasecmp (traceString, TRACE_TEXT_STR) == 0)
-    traceID = TRACE_TEXT;
-  else if (strcasecmp (traceString, TRACE_PHM_STR) == 0)
-    traceID = TRACE_PHM;
-  else if (strcasecmp (traceString, TRACE_PLOT_STR) == 0)
-    traceID = TRACE_PLOT;
-  else if (strcasecmp (traceString, TRACE_CLIPPING_STR) == 0)
-    traceID = TRACE_CLIPPING;
-  else if (strcasecmp (traceString, TRACE_RAYS_STR) == 0)
-    traceID = TRACE_RAYS;
-
-  return (traceID);
-}
-
-
 #endif