Fix a bug in cloud texture state loading which caused the cloud textures to

[simgear.git] / simgear / timing / timezone.h

diff --git a/simgear/timing/timezone.h b/simgear/timing/timezone.h
index cac4acadd28d5017bb2e852c88e7660e55a7dd89..5d3035d5b8f16637662d45bb5797963e25438a29 100644 (file)
--- a/simgear/timing/timezone.h
+++ b/simgear/timing/timezone.h
@@ -2,19 +2,20 @@
  * timezone.h
  * Written by Durk Talsma. Started July 1999.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA  02111-1307, USA.
  *
  **************************************************************************/
 
@@ -29,30 +30,31 @@
 #ifndef _TIMEZONE_H_
 #define _TIMEZONE_H_
 
-#include "geocoord.h"
 #include <stdio.h>
 
+#include <simgear/timing/geocoord.h>
+
 class Timezone : public GeoCoord
 {
 private:
-  char* countryCode;
-  char* descriptor;
+  string countryCode;
+  string descriptor;
 
 public:
   Timezone() :
     GeoCoord()
     { 
-      countryCode = 0; 
-      descriptor = 0;
+      countryCode.erase(); 
+      descriptor.erase();
     };
   Timezone(float la, float lo, char* cc, char* desc);
   Timezone(const char *infoString);
   Timezone(const Timezone &other);
-  virtual ~Timezone() { delete [] countryCode; delete [] descriptor; };
+  virtual ~Timezone() { };
   
 
-  virtual void print() { printf("%s", descriptor);};
-  virtual char * getDescription() { return descriptor; };
+  virtual void print() { printf("%s", descriptor.c_str());};
+  virtual const char * getDescription() { return descriptor.c_str(); };
 };
 
 /************************************************************************