| -rw-r--r-- | library/timestring.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/library/timestring.h b/library/timestring.h index b8d1aea..9a2889b 100644 --- a/library/timestring.h +++ b/library/timestring.h @@ -11,26 +11,16 @@ ** 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. ** 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. ** **********************************************************************/ #ifndef _TIMESTRING_H_ @@ -151,21 +141,21 @@ public: static bool currentAMPM(); static DateFormat currentDateFormat(); 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 ) { return longNumberDateString( d, currentDateFormat() ); } |