summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/timestring.h16
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
@@ -16,16 +16,6 @@
16** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17** See the GNU General Public License for more details. 17** See the GNU General Public License for more details.
18** 18**
19** In addition, as a special exception Trolltech gives permission to link
20** the code of this program with Qtopia applications copyrighted, developed
21** and distributed by Trolltech under the terms of the Qtopia Personal Use
22** License Agreement. You must comply with the GNU General Public License
23** in all respects for all of the code used other than the applications
24** licensed under the Qtopia Personal Use License Agreement. If you modify
25** this file, you may extend this exception to your version of the file,
26** but you are not obligated to do so. If you do not wish to do so, delete
27** this exception statement from your version.
28**
29** See http://www.trolltech.com/gpl/ for GPL licensing information. 19** See http://www.trolltech.com/gpl/ for GPL licensing information.
30** 20**
31** Contact info@trolltech.com if any conditions of this licensing are 21** Contact info@trolltech.com if any conditions of this licensing are
@@ -156,11 +146,11 @@ public:
156 static void disconnectChange(QObject*,const char* member); 146 static void disconnectChange(QObject*,const char* member);
157 147
158 // Not recommended to call these (they don't honor system ampm) 148 // Not recommended to call these (they don't honor system ampm)
159 static QString dateString( const QDateTime &t, bool ampm ); 149 static QString dateString( const QDateTime &t, bool ampm = false);
160 static QString timeString( const QTime &t, bool ampm, bool seconds ); 150 static QString timeString( const QTime &t, bool ampm, bool seconds );
161 static QString timeString( const QTime &t, bool ampm ); 151 static QString timeString( const QTime &t, bool ampm = false);
162 static QString shortTime( bool ampm, bool seconds ); 152 static QString shortTime( bool ampm, bool seconds );
163 static QString shortTime( bool ampm ); 153 static QString shortTime( bool ampm = false);
164 154
165 static QString numberDateString( const QDate &d, DateFormat ); 155 static QString numberDateString( const QDate &d, DateFormat );
166 static QString numberDateString( const QDate &d ) 156 static QString numberDateString( const QDate &d )