diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h index 22fce04a84f..22bd805ae35 100644 --- a/content/xul/document/src/nsXULDocument.h +++ b/content/xul/document/src/nsXULDocument.h @@ -655,11 +655,6 @@ protected: * @param aURI the URI of the overlay that failed to load */ void ReportMissingOverlay(nsIURI* aURI); - -#if defined(DEBUG_waterson) || defined(DEBUG_hyatt) - // timing - nsTime mLoadStart; -#endif class CachedChromeStreamListener : public nsIStreamListener { protected: diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 72660d0df34..4c6f3c46e55 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -50,7 +50,6 @@ #include "plstr.h" #include "nsDTDUtils.h" #include "nsHTMLTokenizer.h" -#include "nsTime.h" #include "nsParserNode.h" #include "nsHTMLEntities.h" #include "nsLinebreakConverter.h" diff --git a/parser/htmlparser/src/CNavDTD.h b/parser/htmlparser/src/CNavDTD.h index ad261b4690a..d4645d0ce15 100644 --- a/parser/htmlparser/src/CNavDTD.h +++ b/parser/htmlparser/src/CNavDTD.h @@ -102,7 +102,6 @@ #include "nsHTMLTags.h" #include "nsDeque.h" #include "nsParserCIID.h" -#include "nsTime.h" #include "nsDTDUtils.h" #include "nsParser.h" #include "nsCycleCollectionParticipant.h" diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp index 1051ec1b30f..9d3bad04b86 100644 --- a/security/manager/ssl/src/nsNSSCertificate.cpp +++ b/security/manager/ssl/src/nsNSSCertificate.cpp @@ -59,7 +59,6 @@ #include "nsXPIDLString.h" #include "nsReadableUtils.h" #include "nsIURI.h" -#include "nsTime.h" #include "nsIProxyObjectManager.h" #include "nsCRT.h" #include "nsUsageArrayHelper.h" diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index 552f9ba2780..7df5d23e24c 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -91,7 +91,6 @@ #include "nsReadableUtils.h" #include "nsIDateTimeFormat.h" #include "prtypes.h" -#include "nsTime.h" #include "nsIEntropyCollector.h" #include "nsIBufEntropyCollector.h" #include "nsIServiceManager.h" diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index 4851c5af845..26e79ad2cb6 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -106,7 +106,6 @@ EXPORTS = \ nsStaticAtom.h \ nsSupportsArray.h \ nsSupportsPrimitives.h \ - nsTime.h \ nsVariant.h \ nsStringEnumerator.h \ nsHashPropertyBag.h \ diff --git a/xpcom/ds/nsTime.h b/xpcom/ds/nsTime.h deleted file mode 100644 index d4270736770..00000000000 --- a/xpcom/ds/nsTime.h +++ /dev/null @@ -1,124 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsTime_h__ -#define nsTime_h__ - -#include "prtime.h" -#include "nscore.h" - -/** - * This class encapsulates full 64-bit time functionality and - * provides simple arithmetic and conversion operations. - */ - -// If you ever decide that you need to add a non-inline method to this -// class, be sure to change the class declaration to "class NS_BASE -// nsTime". - -class nsTime -{ -public: - /** - * Construct the current time. - */ - nsTime(void) : mValue(PR_Now()) { - } - - /** - * Construct the time from a string. - */ - nsTime(const char* dateStr, PRBool defaultToGMT) { - PRInt64 theTime; - PRStatus status = PR_ParseTimeString(dateStr, defaultToGMT, &theTime); - if (status == PR_SUCCESS) - mValue = theTime; - else - mValue = LL_ZERO; - } - - /** - * Construct a time from a PRTime. - */ - nsTime(const PRTime aTime) : mValue(aTime) { - } - - // ~nsTime(void) -- XXX destructor unnecessary - - /** - * Convert a nsTime object to a PRTime - */ - operator PRTime(void) const { - return mValue; - } - - PRInt64 mValue; -}; - -/** - * Determine if one time is strictly less than another - */ -inline const PRBool -operator <(const nsTime& aTime1, const nsTime& aTime2) { - return aTime1.mValue < aTime2.mValue; -} - -/** - * Determine if one time is less than or equal to another - */ -inline const PRBool -operator <=(const nsTime& aTime1, const nsTime& aTime2) { - return aTime1.mValue <= aTime2.mValue; -} - -/** - * Determine if one time is strictly greater than another - */ -inline const PRBool -operator >(const nsTime& aTime1, const nsTime& aTime2) { - return aTime1.mValue > aTime2.mValue; -} - -/** - * Determine if one time is greater than or equal to another - */ -inline const PRBool -operator >=(const nsTime& aTime1, const nsTime& aTime2) { - return aTime1.mValue >= aTime2.mValue; -} - -#endif // nsTime_h__