<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[19945] trunk/JavaScriptCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19945">19945</a></dd>
<dt>Author</dt> <dd>aroben</dd>
<dt>Date</dt> <dd>2007-03-02 11:55:21 -0800 (Fri, 02 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorekjsDateMathcpp">trunk/JavaScriptCore/kjs/DateMath.cpp</a></li>
<li><a href="#trunkJavaScriptCorekjsDateMathh">trunk/JavaScriptCore/kjs/DateMath.h</a></li>
<li><a href="#trunkJavaScriptCorekjsdate_objectcpp">trunk/JavaScriptCore/kjs/date_object.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (19944 => 19945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2007-03-02 19:53:42 UTC (rev 19944)
+++ trunk/JavaScriptCore/ChangeLog 2007-03-02 19:55:21 UTC (rev 19945)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-03-02 Adam Roben <aroben@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2007-03-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Kevin McCullough.
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsDateMathcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/DateMath.cpp (19944 => 19945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/DateMath.cpp 2007-03-02 19:53:42 UTC (rev 19944)
+++ trunk/JavaScriptCore/kjs/DateMath.cpp 2007-03-02 19:55:21 UTC (rev 19945)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void msToGregorianDateTime(double ms, bool outputIsUTC, struct GregorianDateTime& tm)
</del><ins>+void msToGregorianDateTime(double ms, bool outputIsUTC, GregorianDateTime& tm)
</ins><span class="cx"> {
</span><span class="cx"> // input is UTC
</span><span class="cx"> double dstOff = 0.0;
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsDateMathh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/DateMath.h (19944 => 19945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/DateMath.h 2007-03-02 19:53:42 UTC (rev 19944)
+++ trunk/JavaScriptCore/kjs/DateMath.h 2007-03-02 19:55:21 UTC (rev 19945)
</span><span class="lines">@@ -47,6 +47,13 @@
</span><span class="cx">
</span><span class="cx"> namespace KJS {
</span><span class="cx">
</span><ins>+struct GregorianDateTime;
+
+void msToGregorianDateTime(double, bool outputIsUTC, GregorianDateTime&);
+double gregorianDateTimeToMS(const GregorianDateTime&, double, bool inputIsUTC);
+double getUTCOffset();
+int equivalentYearForDST(int year);
+
</ins><span class="cx"> const char * const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
</span><span class="cx"> const char * const monthName[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
</span><span class="cx">
</span><span class="lines">@@ -61,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> // Intentionally overridding the default tm of the system
</span><span class="cx"> // Not all OS' have the same members of their tm's
</span><del>-struct GregorianDateTime : Noncopyable{
</del><ins>+struct GregorianDateTime : Noncopyable {
</ins><span class="cx"> GregorianDateTime()
</span><span class="cx"> : second(0)
</span><span class="cx"> , minute(0)
</span><span class="lines">@@ -141,11 +148,6 @@
</span><span class="cx"> char* timeZone;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void msToGregorianDateTime(double, bool outputIsUTC, struct GregorianDateTime&);
-double gregorianDateTimeToMS(const GregorianDateTime&, double, bool inputIsUTC);
-double getUTCOffset();
-int equivalentYearForDST(int year);
-
</del><span class="cx"> } //namespace KJS
</span><span class="cx">
</span><span class="cx"> #endif // DateMath_h
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsdate_objectcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/date_object.cpp (19944 => 19945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/date_object.cpp 2007-03-02 19:53:42 UTC (rev 19944)
+++ trunk/JavaScriptCore/kjs/date_object.cpp 2007-03-02 19:55:21 UTC (rev 19945)
</span><span class="lines">@@ -158,16 +158,16 @@
</span><span class="cx">
</span><span class="cx"> enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
</span><span class="cx">
</span><del>-static JSCell* formatLocaleDate(GregorianDateTime gdt, const LocaleDateTimeFormat format)
</del><ins>+static JSCell* formatLocaleDate(const GregorianDateTime& gdt, const LocaleDateTimeFormat format)
</ins><span class="cx"> {
</span><span class="cx"> static const char* formatStrings[] = {"%#c", "%#x", "%X"};
</span><span class="cx">
</span><span class="cx"> // Offset year if needed
</span><span class="cx"> struct tm localTM = gdt;
</span><del>- gdt.year += 1900;
- bool yearNeedsOffset = gdt.year < 1900 || gdt.year > 2038;
</del><ins>+ int year = gdt.year + 1900;
+ bool yearNeedsOffset = year < 1900 || year > 2038;
</ins><span class="cx"> if (yearNeedsOffset) {
</span><del>- localTM.tm_year = equivalentYearForDST(gdt.year) - 1900;
</del><ins>+ localTM.tm_year = equivalentYearForDST(year) - 1900;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Do the formatting
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> snprintf(yearString, yearLen, "%d", localTM.tm_year + 1900);
</span><span class="cx"> char* yearLocation = strstr(timebuffer, yearString);
</span><del>- snprintf(yearString, yearLen, "%d", gdt.year);
</del><ins>+ snprintf(yearString, yearLen, "%d", year);
</ins><span class="cx">
</span><span class="cx"> strncpy(yearLocation, yearString, yearLen - 1);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>