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
@@ -17,13 +17,13 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "timestring.h"
 #include <qobject.h>
-#include "qpeapplication.h" //for qApp
+#include <qpe/qpeapplication.h> //for qApp
 #include "config.h"
 
 
 class TimeStringFormatKeeper : public QObject
 {
     Q_OBJECT
@@ -46,13 +46,13 @@ private:
     TimeStringFormatKeeper()
         : QObject( qApp )
     {
         Config config("qpe");
         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));
 
         connect( qApp, SIGNAL( dateFormatChanged(DateFormat) ),
                  this, SLOT( formatChanged( DateFormat ) ) );
     }
 };
@@ -62,13 +62,13 @@ TimeStringFormatKeeper *TimeStringFormatKeeper::self = 0;
 QString DateFormat::toNumberString() const
 {
     QString buf = "";
     // for each part of the order
     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" );
                 break;
             case 0x0002:
                 buf += QObject::tr( "M" );
                 break;
@@ -85,30 +85,30 @@ QString DateFormat::toNumberString() const
 QString DateFormat::toWordString() const
 {
     QString buf = "";
     // for each part of the order
     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 += " ";
                 }
                 break;
             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;
         }
     }
     return buf;
 }
@@ -119,13 +119,13 @@ QString DateFormat::numberDate(const QDate &d, int v) const
 
     int pad = 2;
 
     // for each part of the order
     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());
               else buf += QString().sprintf("%d",d.day());
                 break;
             case 0x0002:
               if (i==0) { // no padding with only MM/DD/YY format
@@ -158,39 +158,39 @@ QString DateFormat::wordDate(const QDate &d, int v) const
         if (!(v & longWord)) {
             weekDay = weekDay.left(3);
         }
         buf += weekDay;
         if ((_longOrder & 0x0007) == 0x0002)
             buf += ' ';
-        else 
+        else
             buf += ", ";
     }
 
     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) {
                 buf += QString().sprintf("%02d, ",d.day());
               } else {
                 buf += QString().sprintf("%2d",d.day());
-                if (separator()=='.') // 2002/1/11 
+                if (separator()=='.') // 2002/1/11
                   buf += ". ";
-                    else 
+                    else
                         buf += " ";
                 }
                 break;
             case 0x0002:
                 {
                     QString monthName = d.monthName(d.month());
                     if (!(v & longWord)) {
                         monthName = monthName.left(3);
                     }
                     buf += monthName;
                 }
-                if (i < 2) 
+                if (i < 2)
                     buf += " ";
                 break;
             case 0x0004:
                 {
                     int year = d.year();
                     if (!(v & longNumber))
@@ -198,13 +198,13 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 
                     if (year < 10)
                         buf += "0";
 
                     buf += QString::number(year);
                 }
-                if (i < 2) 
+                if (i < 2)
                     buf += ", ";
                 break;
         }
     }
     return buf;
 }
@@ -216,13 +216,13 @@ void DateFormat::save(QDataStream &d) const
     uint v= _shortOrder;
     d << v;
     v = _longOrder;
     d << v;
 }
 
-void DateFormat::load(QDataStream &d) 
+void DateFormat::load(QDataStream &d)
 {
     ushort value;
     d >> value;
     _shortSeparator = QChar(value);
     uint v = 0;
     d >> v;
@@ -254,13 +254,13 @@ QString TimeString::dateString( const QDate &d, DateFormat dtf )
     return dtf.wordDate(d, DateFormat::longNumber | DateFormat::longWord);
 }
 
 
 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);
 }
 
 DateFormat TimeString::currentDateFormat()
 {
     return TimeStringFormatKeeper::currentFormat();