Changeset 19945 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Mar 2, 2007, 11:55:21 AM (18 years ago)

Author:

aroben

Message:

Reviewed by Kevin M.

Try to fix the Qt build.

• kjs/DateMath.cpp: (KJS::msToGregorianDateTime): Removed unnecessary "struct" keyword.
• kjs/DateMath.h: Moved forward declarations to the top of the file before they are used.
• kjs/date_object.cpp: (KJS::formatLocaleDate): Changed to take a const GregorianDateTime& since GregorianDateTime is Noncopyable.

Location:

trunk/JavaScriptCore/kjs

Files:

• DateMath.cpp (modified) (1 diff)
• DateMath.h (modified) (3 diffs)
• date_object.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -402 +402 @@
 }
 
-void msToGregorianDateTime(double ms, bool outputIsUTC, struct GregorianDateTime& tm)
+void msToGregorianDateTime(double ms, bool outputIsUTC, GregorianDateTime& tm)
 {
     // input is UTC

trunk/JavaScriptCore/kjs/DateMath.h

@@ -48 +48 @@
 namespace KJS {
 
+struct GregorianDateTime;
+
+void msToGregorianDateTime(double, bool outputIsUTC, GregorianDateTime&);
+double gregorianDateTimeToMS(const GregorianDateTime&, double, bool inputIsUTC);
+double getUTCOffset();
+int equivalentYearForDST(int year);
+
 const char * const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
 const char * const monthName[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
@@ -62 +69 @@
 // Intentionally overridding the default tm of the system
 // Not all OS' have the same members of their tm's
-struct GregorianDateTime : Noncopyable{
+struct GregorianDateTime : Noncopyable {
     GregorianDateTime()
         : second(0)
@@ -142 +149 @@
 };
 
-void msToGregorianDateTime(double, bool outputIsUTC, struct GregorianDateTime&);
-double gregorianDateTimeToMS(const GregorianDateTime&, double, bool inputIsUTC);
-double getUTCOffset();
-int equivalentYearForDST(int year);
-
 }   //namespace KJS
 

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -159 +159 @@
 enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
  
-static JSCell* formatLocaleDate(GregorianDateTime gdt, const LocaleDateTimeFormat format)
+static JSCell* formatLocaleDate(const GregorianDateTime& gdt, const LocaleDateTimeFormat format)
 {
     static const char* formatStrings[] = {"%#c", "%#x", "%X"};
@@ -165 +165 @@
     // Offset year if needed
     struct tm localTM = gdt;
-    gdt.year += 1900;
-    bool yearNeedsOffset = gdt.year < 1900 || gdt.year > 2038;
+    int year = gdt.year + 1900;
+    bool yearNeedsOffset = year < 1900 || year > 2038;
     if (yearNeedsOffset) {
-        localTM.tm_year = equivalentYearForDST(gdt.year) - 1900;
+        localTM.tm_year = equivalentYearForDST(year) - 1900;
      }
  
@@ -186 +186 @@
         snprintf(yearString, yearLen, "%d", localTM.tm_year + 1900);
         char* yearLocation = strstr(timebuffer, yearString);
-        snprintf(yearString, yearLen, "%d", gdt.year);
+        snprintf(yearString, yearLen, "%d", year);
  
         strncpy(yearLocation, yearString, yearLen - 1);