| -rw-r--r-- | library/timestring.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/library/timestring.cpp b/library/timestring.cpp index 4c6fa72..6443b6b 100644 --- a/library/timestring.cpp +++ b/library/timestring.cpp @@ -21,5 +21,5 @@ #include "timestring.h" #include <qobject.h> -#include "qpeapplication.h" //for qApp +#include <qpe/qpeapplication.h> //for qApp #include "config.h" @@ -50,5 +50,5 @@ private: config.setGroup( "Date" ); format = DateFormat(QChar(config.readEntry("Separator", "/")[0]), - (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear), + (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear), (DateFormat::Order)config.readNumEntry("LongOrder", DateFormat::DayMonthYear)); @@ -66,5 +66,5 @@ QString DateFormat::toNumberString() const for (int i = 0; i < 3; i++) { // switch on the relavent 3 bits. - switch((_shortOrder >> (i * 3)) & 0x0007) { + switch((_shortOrder >> (i * 3)) & 0x0007) { case 0x0001: buf += QObject::tr( "D" ); @@ -89,11 +89,11 @@ QString DateFormat::toWordString() const for (int i = 0; i < 3; i++) { // switch on the relavent 3 bits. - switch((_longOrder >> (i * 3)) & 0x0007) { + switch((_longOrder >> (i * 3)) & 0x0007) { case 0x0001: buf += QObject::tr( "day" ); - if (i < 2) { + if (i < 2) { if ((_shortOrder << ((i+1) * 3)) & 0x0007) buf += ", "; - else + else buf += " "; } @@ -101,10 +101,10 @@ QString DateFormat::toWordString() const case 0x0002: buf += QObject::tr( "month" ); - if (i < 2) + if (i < 2) buf += " "; break; case 0x0004: buf += QObject::tr( "year" ); - if (i < 2) + if (i < 2) buf += ", "; break; @@ -123,5 +123,5 @@ QString DateFormat::numberDate(const QDate &d, int v) const for (int i = 0; i < 3; i++) { // switch on the relavent 3 bits. - switch((_shortOrder >> (i * 3)) & 0x0007) { + switch((_shortOrder >> (i * 3)) & 0x0007) { case 0x0001: if (pad==2) buf += QString().sprintf("%02d",d.day()); @@ -162,5 +162,5 @@ QString DateFormat::wordDate(const QDate &d, int v) const if ((_longOrder & 0x0007) == 0x0002) buf += ' '; - else + else buf += ", "; } @@ -168,5 +168,5 @@ QString DateFormat::wordDate(const QDate &d, int v) const for (int i = 0; i < 3; i++) { // switch on the relavent 3 bits. - switch((_longOrder >> (i * 3)) & 0x0007) { + switch((_longOrder >> (i * 3)) & 0x0007) { case 0x0001: if (i==1) { @@ -174,7 +174,7 @@ QString DateFormat::wordDate(const QDate &d, int v) const } else { buf += QString().sprintf("%2d",d.day()); - if (separator()=='.') // 2002/1/11 + if (separator()=='.') // 2002/1/11 buf += ". "; - else + else buf += " "; } @@ -188,5 +188,5 @@ QString DateFormat::wordDate(const QDate &d, int v) const buf += monthName; } - if (i < 2) + if (i < 2) buf += " "; break; @@ -202,5 +202,5 @@ QString DateFormat::wordDate(const QDate &d, int v) const buf += QString::number(year); } - if (i < 2) + if (i < 2) buf += ", "; break; @@ -220,5 +220,5 @@ void DateFormat::save(QDataStream &d) const } -void DateFormat::load(QDataStream &d) +void DateFormat::load(QDataStream &d) { ushort value; @@ -258,5 +258,5 @@ QString TimeString::dateString( const QDate &d, DateFormat dtf ) QString TimeString::longDateString( const QDate &d, DateFormat dtf ) { - return dtf.wordDate(d, DateFormat::showWeekDay | DateFormat::longNumber + return dtf.wordDate(d, DateFormat::showWeekDay | DateFormat::longNumber | DateFormat::longWord); } |