[QGIS Commit] r12703 - trunk/qgis/src/core/gps

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-07 16:24:17 -0500 (Thu, 07 Jan 2010)
New Revision: 12703

Added:
   trunk/qgis/src/core/gps/nmeatime.h
Removed:
   trunk/qgis/src/core/gps/time.h
Modified:
   trunk/qgis/src/core/gps/info.h
   trunk/qgis/src/core/gps/time.c
Log:
rename src/core/gps/time.h to nmeatime.h

Modified: trunk/qgis/src/core/gps/info.h
===================================================================
--- trunk/qgis/src/core/gps/info.h	2010-01-07 20:33:05 UTC (rev 12702)
+++ trunk/qgis/src/core/gps/info.h	2010-01-07 21:24:17 UTC (rev 12703)
@@ -13,7 +13,7 @@
 #ifndef __NMEA_INFO_H__
 #define __NMEA_INFO_H__
 
-#include "time.h"
+#include "nmeatime.h"
 
 #define NMEA_SIG_BAD        (0)
 #define NMEA_SIG_LOW        (1)

Copied: trunk/qgis/src/core/gps/nmeatime.h (from rev 12697, trunk/qgis/src/core/gps/time.h)
===================================================================
--- trunk/qgis/src/core/gps/nmeatime.h	                        (rev 0)
+++ trunk/qgis/src/core/gps/nmeatime.h	2010-01-07 21:24:17 UTC (rev 12703)
@@ -0,0 +1,48 @@
+/*
+ *
+ * NMEA library
+ * URL: http://nmea.sourceforge.net
+ * Author: Tim (xtimor at gmail.com)
+ * Licence: http://www.gnu.org/licenses/lgpl.html
+ * $Id: time.h 4 2007-08-27 13:11:03Z xtimor $
+ *
+ */
+
+/*! \file */
+
+#ifndef __NMEA_TIME_H__
+#define __NMEA_TIME_H__
+
+#include "config.h"
+
+#ifdef  __cplusplus
+extern "C"
+{
+#endif
+
+  /**
+   * Date and time data
+   * @see nmea_time_now
+   */
+  typedef struct _nmeaTIME
+  {
+    int     year;       /**< Years since 1900 */
+    int     mon;        /**< Months since January - [0,11] */
+    int     day;        /**< Day of the month - [1,31] */
+    int     hour;       /**< Hours since midnight - [0,23] */
+    int     min;        /**< Minutes after the hour - [0,59] */
+    int     sec;        /**< Seconds after the minute - [0,59] */
+    int     hsec;       /**< Hundredth part of second - [0,99] */
+
+  } nmeaTIME;
+
+  /**
+   * \brief Get time now to nmeaTIME structure
+   */
+  void nmea_time_now( nmeaTIME *t );
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* __NMEA_TIME_H__ */

Modified: trunk/qgis/src/core/gps/time.c
===================================================================
--- trunk/qgis/src/core/gps/time.c	2010-01-07 20:33:05 UTC (rev 12702)
+++ trunk/qgis/src/core/gps/time.c	2010-01-07 21:24:17 UTC (rev 12703)
@@ -8,9 +8,9 @@
  *
  */
 
-/*! \file time.h */
+/*! \file nmeatime.h */
 
-#include "time.h"
+#include "nmeatime.h"
 
 #ifdef NMEA_WIN
 #   pragma warning(disable: 4201)

Deleted: trunk/qgis/src/core/gps/time.h
===================================================================
--- trunk/qgis/src/core/gps/time.h	2010-01-07 20:33:05 UTC (rev 12702)
+++ trunk/qgis/src/core/gps/time.h	2010-01-07 21:24:17 UTC (rev 12703)
@@ -1,48 +0,0 @@
-/*
- *
- * NMEA library
- * URL: http://nmea.sourceforge.net
- * Author: Tim (xtimor at gmail.com)
- * Licence: http://www.gnu.org/licenses/lgpl.html
- * $Id: time.h 4 2007-08-27 13:11:03Z xtimor $
- *
- */
-
-/*! \file */
-
-#ifndef __NMEA_TIME_H__
-#define __NMEA_TIME_H__
-
-#include "config.h"
-
-#ifdef  __cplusplus
-extern "C"
-{
-#endif
-
-  /**
-   * Date and time data
-   * @see nmea_time_now
-   */
-  typedef struct _nmeaTIME
-  {
-    int     year;       /**< Years since 1900 */
-    int     mon;        /**< Months since January - [0,11] */
-    int     day;        /**< Day of the month - [1,31] */
-    int     hour;       /**< Hours since midnight - [0,23] */
-    int     min;        /**< Minutes after the hour - [0,59] */
-    int     sec;        /**< Seconds after the minute - [0,59] */
-    int     hsec;       /**< Hundredth part of second - [0,99] */
-
-  } nmeaTIME;
-
-  /**
-   * \brief Get time now to nmeaTIME structure
-   */
-  void nmea_time_now( nmeaTIME *t );
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __NMEA_TIME_H__ */