Actually most of them are -+ cause I opened them in xemacs..

The main goal is to
replace some header names to let them be overwritten by external once
so "qpeapplication.h" is now <qpe/qpeapplication.h>
I'll check if it's building on non Qt2/X11 systems...

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
@@ -22,3 +22,3 @@
 #include <qobject.h>
-#include "qpeapplication.h" //for qApp
+#include <qpe/qpeapplication.h> //for qApp
 #include "config.h"
@@ -51,3 +51,3 @@ private:
 	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));
@@ -67,3 +67,3 @@ QString DateFormat::toNumberString() const
 	// switch on the relavent 3 bits.
-	switch((_shortOrder >> (i * 3)) & 0x0007) { 
+	switch((_shortOrder >> (i * 3)) & 0x0007) {
 	    case 0x0001:
@@ -90,9 +90,9 @@ QString DateFormat::toWordString() const
 	// 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 += " ";
@@ -102,3 +102,3 @@ QString DateFormat::toWordString() const
 		buf += QObject::tr( "month" );
-		if (i < 2) 
+		if (i < 2)
 		    buf += " ";
@@ -107,3 +107,3 @@ QString DateFormat::toWordString() const
 		buf += QObject::tr( "year" );
-		if (i < 2) 
+		if (i < 2)
 		    buf += ", ";
@@ -124,3 +124,3 @@ QString DateFormat::numberDate(const QDate &d, int v) const
 	// switch on the relavent 3 bits.
-	switch((_shortOrder >> (i * 3)) & 0x0007) { 
+	switch((_shortOrder >> (i * 3)) & 0x0007) {
 	    case 0x0001:
@@ -163,3 +163,3 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 	    buf += ' ';
-	else 
+	else
 	    buf += ", ";
@@ -169,3 +169,3 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 	// switch on the relavent 3 bits.
-	switch((_longOrder >> (i * 3)) & 0x0007) { 
+	switch((_longOrder >> (i * 3)) & 0x0007) {
 	    case 0x0001:
@@ -175,5 +175,5 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 		buf += QString().sprintf("%2d",d.day());
-		if (separator()=='.') // 2002/1/11 
+		if (separator()=='.') // 2002/1/11
 		  buf += ". ";
-		    else 
+		    else
 			buf += " ";
@@ -189,3 +189,3 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 		}
-		if (i < 2) 
+		if (i < 2)
 		    buf += " ";
@@ -203,3 +203,3 @@ QString DateFormat::wordDate(const QDate &d, int v) const
 		}
-		if (i < 2) 
+		if (i < 2)
 		    buf += ", ";
@@ -221,3 +221,3 @@ void DateFormat::save(QDataStream &d) const
 
-void DateFormat::load(QDataStream &d) 
+void DateFormat::load(QDataStream &d)
 {
@@ -259,3 +259,3 @@ 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);