1 files changed, 25 insertions, 14 deletions

diff --git a/libopie2/opiepim/core/oconversion.cpp b/libopie2/opiepim/core/oconversion.cpp
index b7eebef..160c2c6 100644
--- a/libopie2/opiepim/core/oconversion.cpp
+++ b/libopie2/opiepim/core/oconversion.cpp
@@ -2,3 +2,2 @@
                              This file is part of the Opie Project

-                             Copyright (C) The Main Author <main-author@whereever.org>

               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>

@@ -29,2 +28,3 @@
 

+/* OPIE */

 #include <opie2/oconversion.h>

@@ -32,4 +32,4 @@
 

-

-namespace Opie {

+namespace Opie

+{

 

@@ -53,2 +53,3 @@ QString OConversion::dateToString( const QDate &d )
 

+

 QDate OConversion::dateFromString( const QString& s )

@@ -73,3 +74,4 @@ QDate OConversion::dateFromString( const QString& s )
         // but we isValid() again? -zecke

-        if ( year < 1900 || year > 3000 ) {

+    if ( year < 1900 || year > 3000 )

+    {

                 qWarning( "PimContact year is not in range");

@@ -77,3 +79,4 @@ QDate OConversion::dateFromString( const QString& s )
         }

-        if ( month < 0 || month > 12 ) {

+    if ( month < 0 || month > 12 )

+    {

                 qWarning( "PimContact month is not in range");

@@ -81,3 +84,4 @@ QDate OConversion::dateFromString( const QString& s )
         }

-        if ( day < 0 || day > 31 ) {

+    if ( day < 0 || day > 31 )

+    {

                 qWarning( "PimContact day is not in range");

@@ -87,3 +91,4 @@ QDate OConversion::dateFromString( const QString& s )
         date.setYMD( year, month, day );

-        if ( !date.isValid() ) {

+    if ( !date.isValid() )

+    {

                 qWarning( "PimContact date is not valid");

@@ -94,4 +99,8 @@ QDate OConversion::dateFromString( const QString& s )
 }

-QString OConversion::dateTimeToString( const QDateTime& dt ) {

-    if (!dt.isValid() || dt.isNull() ) return QString::null;

+

+

+QString OConversion::dateTimeToString( const QDateTime& dt )

+{

+    if ( !dt.isValid() || dt.isNull() )

+        return QString::null;

 

@@ -111,9 +120,11 @@ QString OConversion::dateTimeToString( const QDateTime& dt ) {
 

-    QString str = day + month + year + hour + min + sec;

-

-    return str;

+    return day + month + year + hour + min + sec;

 }

-QDateTime OConversion::dateTimeFromString( const QString& str) {

 

-    if ( str.isEmpty() ) return QDateTime();

+

+QDateTime OConversion::dateTimeFromString( const QString& str )

+{

+

+    if ( str.isEmpty() )

+        return QDateTime();

     int day   = str.mid(0, 2).toInt();