summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2006-07-17 20:04:18 (UTC)
committer llornkcor <llornkcor>2006-07-17 20:04:18 (UTC)
commit3e77cb64e7ca0d89656e6665c1007bff6b34d609 (patch) (side-by-side diff)
tree1708763bc99ed75de6c395093c9421b1bd0fe268
parent20b8c8eb22b5498647430da49986f75b78cf2d79 (diff)
downloadopie-3e77cb64e7ca0d89656e6665c1007bff6b34d609.zip
opie-3e77cb64e7ca0d89656e6665c1007bff6b34d609.tar.gz
opie-3e77cb64e7ca0d89656e6665c1007bff6b34d609.tar.bz2
supply default arguments
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/timestring.h32
1 files changed, 11 insertions, 21 deletions
diff --git a/library/timestring.h b/library/timestring.h
index b8d1aea..9a2889b 100644
--- a/library/timestring.h
+++ b/library/timestring.h
@@ -1,34 +1,24 @@
/**********************************************************************
** Copyright (C) 2000-2006 Trolltech AS. All rights reserved.
**
** This file is part of the Qtopia Environment.
-**
+**
** 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.
-**
-** A copy of the GNU GPL license version 2 is included in this package as
+**
+** A copy of the GNU GPL license version 2 is included in this package as
** LICENSE.GPL.
**
** This program 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.
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
** See the GNU General Public License for more details.
**
-** In addition, as a special exception Trolltech gives permission to link
-** the code of this program with Qtopia applications copyrighted, developed
-** and distributed by Trolltech under the terms of the Qtopia Personal Use
-** License Agreement. You must comply with the GNU General Public License
-** in all respects for all of the code used other than the applications
-** licensed under the Qtopia Personal Use License Agreement. If you modify
-** this file, you may extend this exception to your version of the file,
-** but you are not obligated to do so. If you do not wish to do so, delete
-** this exception statement from your version.
-**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
@@ -48,13 +38,13 @@
class QObject;
// return a string with the time based on whether or not you want
// you want it in 12 hour form. if ampm is true, then return
// it in 12 hour (am/pm) form otherwise return it in 24 hour form
// in theory Qt 3,0 handles this better (hopefully obsoleteing this)
-class DateFormat
+class DateFormat
{
public:
// date format type 1,2,4 = day,month,year
enum Order {
DayMonthYear = 0421, // right-to-left
MonthDayYear = 0412,
@@ -116,18 +106,18 @@ QDataStream &operator>>(QDataStream &s, DateFormat&df);
#endif
class TimeString
{
public:
- //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601,
+ //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601,
//YearMonthDay = ISO8601 };
//private:
- static QString shortDate( const QDate &d )
+ static QString shortDate( const QDate &d )
{ return shortDate( d, currentDateFormat() ); }
static QString dateString( const QDate &d )
{ return dateString( d, currentDateFormat() ); }
static QString longDateString( const QDate &d )
{ return longDateString( d, currentDateFormat() ); }
static QString dateString( const QDateTime &dt, bool ampm, bool seconds )
@@ -153,17 +143,17 @@ public:
static QArray<DateFormat> formatOptions(); // qtopia 1.6.0
static void connectChange(QObject*,const char* member);
static void disconnectChange(QObject*,const char* member);
// Not recommended to call these (they don't honor system ampm)
- static QString dateString( const QDateTime &t, bool ampm );
+ static QString dateString( const QDateTime &t, bool ampm = false);
static QString timeString( const QTime &t, bool ampm, bool seconds );
- static QString timeString( const QTime &t, bool ampm );
+ static QString timeString( const QTime &t, bool ampm = false);
static QString shortTime( bool ampm, bool seconds );
- static QString shortTime( bool ampm );
+ static QString shortTime( bool ampm = false);
static QString numberDateString( const QDate &d, DateFormat );
static QString numberDateString( const QDate &d )
{ return numberDateString( d, currentDateFormat() ); }
static QString longNumberDateString( const QDate &d, DateFormat );
static QString longNumberDateString( const QDate &d )
@@ -172,11 +162,11 @@ public:
static QString shortDate( const QDate &, DateFormat );
static QString dateString( const QDate &, DateFormat );
static QString longDateString( const QDate &, DateFormat );
private:
static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat );
-
+
};
#endif