1 files changed, 98 insertions, 93 deletions

diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index cce6111..3e06d88 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -17,48 +17,53 @@
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
+
+/* OPIE */
+#include <opie2/opimdateconversion.h>
+#include <opie2/opimstate.h>
+#include <opie2/opimtimezone.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/opimrecurrence.h>
+#include <opie2/otodoaccessxml.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
+#include <qpe/stringutil.h>
+#include <qpe/timeconversion.h>
+
+/* QT */
+#include <qfile.h>
+#include <qvector.h>
+
+/* STD */
 #include <errno.h>
 #include <fcntl.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <unistd.h>
 
 
-#include <qfile.h>
-#include <qvector.h>
-
-#include <qpe/global.h>
-#include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
-
-#include <opie2/opimdateconversion.h>
-#include <opie2/opimstate.h>
-#include <opie2/opimtimezone.h>
-#include <opie2/opimnotifymanager.h>
-#include <opie2/opimrecurrence.h>
-#include <opie2/otodoaccessxml.h>
-
 using namespace Opie;
 
 namespace {
     time_t rp_end;
     OPimRecurrence* rec;
     OPimRecurrence *recur() {
         if (!rec ) rec = new OPimRecurrence;
         return rec;
     }
     int snd;
     enum MoreAttributes {
         FRType = OPimTodo::CompletedDate + 2,
@@ -67,39 +72,39 @@ namespace {
         FRFreq,
         FRHasEndDate,
         FREndDate,
         FRStart,
         FREnd
     };
     // FROM TT again
 char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen)
 {
     char needleChar;
     char haystackChar;
     if (!needle || !haystack || !hLen || !nLen)
-        return 0;
+    return 0;
 
     const char* hsearch = haystack;
 
     if ((needleChar = *needle++) != 0) {
-        nLen--; //(to make up for needle++)
-        do {
-            do {
-                if ((haystackChar = *hsearch++) == 0)
-                    return (0);
-                if (hsearch >= haystack + hLen)
-                    return (0);
-            } while (haystackChar != needleChar);
-        } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
-        hsearch--;
+    nLen--; //(to make up for needle++)
+    do {
+        do {
+        if ((haystackChar = *hsearch++) == 0)
+            return (0);
+        if (hsearch >= haystack + hLen)
+            return (0);
+        } while (haystackChar != needleChar);
+    } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
+    hsearch--;
     }
     return ((char *)hsearch);
 }
 }
 
 namespace Opie {
 
 OPimTodoAccessXML::OPimTodoAccessXML( const QString& appName,
                                 const QString& fileName )
     : OPimTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
 {
     if (!fileName.isEmpty() )
@@ -168,114 +173,114 @@ bool OPimTodoAccessXML::load() {
     /* we do not the file any more */
     ::close( fd );
 
     char* dt = (char*)map_addr;
     int len = attribut.st_size;
     int i = 0;
     char *point;
     const char* collectionString = "<Task ";
     int strLen = strlen(collectionString);
     while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) {
         i = point -dt;
         i+= strLen;
-        qWarning("Found a start at %d %d", i,  (point-dt) );
+        owarn << "Found a start at " << i << " " << (point-dt) << "" << oendl;
 
         OPimTodo ev;
         m_year = m_month = m_day = 0;
 
         while ( TRUE ) {
             while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
-                ++i;
-            if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
-                break;
-
-            // we have another attribute, read it.
-            int j = i;
-            while ( j < len && dt[j] != '=' )
-                ++j;
-            QCString attr( dt+i, j-i+1);
-
-            i = ++j; // skip =
-
-            // find the start of quotes
-            while ( i < len && dt[i] != '"' )
-                ++i;
-            j = ++i;
-
-            bool haveUtf = FALSE;
-            bool haveEnt = FALSE;
-            while ( j < len && dt[j] != '"' ) {
-                if ( ((unsigned char)dt[j]) > 0x7f )
-                    haveUtf = TRUE;
-                if ( dt[j] == '&' )
-                    haveEnt = TRUE;
-                ++j;
-            }
-            if ( i == j ) {
-                // empty value
-                i = j + 1;
-                continue;
-            }
-
-            QCString value( dt+i, j-i+1 );
-            i = j + 1;
-
-            QString str = (haveUtf ? QString::fromUtf8( value )
-                    : QString::fromLatin1( value ) );
-            if ( haveEnt )
-                str = Qtopia::plainString( str );
+        ++i;
+        if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
+        break;
+
+        // we have another attribute, read it.
+        int j = i;
+        while ( j < len && dt[j] != '=' )
+        ++j;
+        QCString attr( dt+i, j-i+1);
+
+        i = ++j; // skip =
+
+        // find the start of quotes
+        while ( i < len && dt[i] != '"' )
+        ++i;
+        j = ++i;
+
+        bool haveUtf = FALSE;
+        bool haveEnt = FALSE;
+        while ( j < len && dt[j] != '"' ) {
+        if ( ((unsigned char)dt[j]) > 0x7f )
+            haveUtf = TRUE;
+        if ( dt[j] == '&' )
+            haveEnt = TRUE;
+        ++j;
+        }
+        if ( i == j ) {
+        // empty value
+        i = j + 1;
+        continue;
+        }
+
+        QCString value( dt+i, j-i+1 );
+        i = j + 1;
+
+        QString str = (haveUtf ? QString::fromUtf8( value )
+            : QString::fromLatin1( value ) );
+        if ( haveEnt )
+        str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             todo( &dict, ev, attr, str );
 
         }
         /*
          * now add it
          */
-        qWarning("End at %d", i );
+        owarn << "End at " << i << "" << oendl;
         if (m_events.contains( ev.uid() ) || ev.uid() == 0) {
             ev.setUid( 1 );
             m_changed = true;
         }
         if ( ev.hasDueDate() ) {
             ev.setDueDate( QDate(m_year, m_month, m_day) );
         }
         if ( rec && rec->doesRecur() ) {
             OPimTimeZone utc = OPimTimeZone::utc();
             OPimRecurrence recu( *rec ); // call copy c'tor
             recu.setEndDate( utc.fromUTCDateTime( rp_end ).date() );
             recu.setStart( ev.dueDate() );
             ev.setRecurrence( recu );
         }
         m_events.insert(ev.uid(), ev );
         m_year = m_month = m_day = -1;
         delete rec;
         rec = 0;
     }
 
     munmap(map_addr, attribut.st_size );
 
-    qWarning("counts %d records loaded!", m_events.count() );
+    owarn << "counts " << m_events.count() << " records loaded!" << oendl;
     return true;
 }
 bool OPimTodoAccessXML::reload() {
     m_events.clear();
     return load();
 }
 bool OPimTodoAccessXML::save() {
-//    qWarning("saving");
+//    owarn << "saving" << oendl;
     if (!m_opened || !m_changed ) {
-//        qWarning("not saving");
+//        owarn << "not saving" << oendl;
         return true;
     }
     QString strNewFile = m_file + ".new";
     QFile f( strNewFile );
     if (!f.open( IO_WriteOnly|IO_Raw ) )
         return false;
 
     int written;
     QString out;
     out = "<!DOCTYPE Tasks>\n<Tasks>\n";
 
     // for all todos
@@ -298,25 +303,25 @@ bool OPimTodoAccessXML::save() {
     QCString cstr = out.utf8();
     written = f.writeBlock( cstr.data(), cstr.length() );
 
     if ( written != (int)cstr.length() ) {
         f.close();
         QFile::remove( strNewFile );
         return false;
     }
     /* flush before renaming */
     f.close();
 
     if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
-//        qWarning("error renaming");
+//        owarn << "error renaming" << oendl;
         QFile::remove( strNewFile );
     }
 
     m_changed = false;
     return true;
 }
 QArray<int> OPimTodoAccessXML::allRecords()const {
     QArray<int> ids( m_events.count() );
     QMap<int, OPimTodo>::ConstIterator it;
     int i = 0;
 
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -336,25 +341,25 @@ OPimTodo OPimTodoAccessXML::find( int uid )const {
     if ( it != m_events.end() )
         todo = it.data();
 
     return todo;
 }
 void OPimTodoAccessXML::clear() {
     if (m_opened )
         m_changed = true;
 
     m_events.clear();
 }
 bool OPimTodoAccessXML::add( const OPimTodo& todo ) {
-//    qWarning("add");
+//    owarn << "add" << oendl;
     m_changed = true;
     m_events.insert( todo.uid(), todo );
 
     return true;
 }
 bool OPimTodoAccessXML::remove( int uid ) {
     m_changed = true;
     m_events.remove( uid );
 
     return true;
 }
 bool OPimTodoAccessXML::replace( const OPimTodo& todo) {
@@ -395,31 +400,31 @@ QArray<int> OPimTodoAccessXML::overDue() {
             ids[i] = it.key();
             i++;
         }
     }
     ids.resize( i );
     return ids;
 }
 
 
 /* private */
 void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
                             const QCString& attr, const QString& val) {
-//    qWarning("parse to do from XMLElement" );
+//    owarn << "parse to do from XMLElement" << oendl;
 
     int *find=0;
 
     find = (*dict)[ attr.data() ];
     if (!find ) {
-//            qWarning("Unknown option" + it.key() );
+//            owarn << "Unknown option" + it.key() << oendl;
         ev.setCustomField( attr, val );
         return;
     }
 
     switch( *find ) {
     case OPimTodo::Uid:
         ev.setUid( val.toInt() );
         break;
     case OPimTodo::Category:
         ev.setCategories( ev.idsFromString( val ) );
         break;
     case OPimTodo::HasDate:
@@ -454,26 +459,26 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
         break;
     case OPimTodo::StartDate:
         ev.setStartDate( OPimDateConversion::dateFromString( val ) );
         break;
     case OPimTodo::State:
         ev.setState( val.toInt() );
         break;
     case OPimTodo::Alarms:{
         OPimNotifyManager &manager = ev.notifiers();
         QStringList als = QStringList::split(";", val );
         for (QStringList::Iterator it = als.begin(); it != als.end(); ++it ) {
             QStringList alarm = QStringList::split(":", (*it), TRUE ); // allow empty
-            qWarning("alarm: %s", alarm.join("___").latin1() );
-            qWarning("alarm[0]: %s %s", alarm[0].latin1(), OPimDateConversion::dateTimeFromString( alarm[0] ).toString().latin1() );
+            owarn << "alarm: " << alarm.join("___") << "" << oendl;
+            owarn << "alarm[0]: " << alarm[0] << " " << OPimDateConversion::dateTimeFromString( alarm[0] ).toString() << "" << oendl;
             OPimAlarm al( alarm[2].toInt(), OPimDateConversion::dateTimeFromString( alarm[0] ), alarm[1].toInt() );
             manager.add( al );
         }
     }
         break;
     case OPimTodo::Reminders:{
         OPimNotifyManager &manager = ev.notifiers();
         QStringList rems = QStringList::split(";", val );
         for (QStringList::Iterator it = rems.begin(); it != rems.end(); ++it ) {
             OPimReminder rem( (*it).toInt() );
             manager.add( rem );
         }
@@ -528,58 +533,58 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
         break;
     }
     default:
         ev.setCustomField( attr, val );
         break;
     }
 }
 
 // from PalmtopRecord... GPL ### FIXME
 namespace {
 QString customToXml(const QMap<QString, QString>& customMap )
 {
-    //qWarning(QString("writing custom %1").arg(customMap.count()));
+    //owarn << QString("writing custom %1").arg(customMap.count()) << oendl;
     QString buf(" ");
     for ( QMap<QString, QString>::ConstIterator cit = customMap.begin();
-            cit != customMap.end(); ++cit) {
-        // qWarning(".ITEM.");
-        buf += cit.key();
-        buf += "=\"";
-        buf += Qtopia::escapeString(cit.data());
-        buf += "\" ";
+        cit != customMap.end(); ++cit) {
+//  owarn << ".ITEM." << oendl;
+    buf += cit.key();
+    buf += "=\"";
+    buf += Qtopia::escapeString(cit.data());
+    buf += "\" ";
     }
     return buf;
 }
 
 
 }
 
 QString OPimTodoAccessXML::toString( const OPimTodo& ev )const {
     QString str;
 
     str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" ";
     str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" ";
     str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
     str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
 
     str += "Categories=\"" + toString( ev.categories() ) + "\" ";
     str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
     str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
 
     if ( ev.hasDueDate() ) {
         str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
         str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
         str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
     }
-//    qWarning( "Uid %d",  ev.uid() );
+//    owarn << "Uid " << ev.uid() << "" << oendl;
     str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 
 // append the extra options
     /* FIXME Qtopia::Record this is currently not
      * possible you can set custom fields
      * but don' iterate over the list
      * I may do #define private protected
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
@@ -608,25 +613,25 @@ QString OPimTodoAccessXML::toString( const OPimTodo& ev )const {
             QStringList als;
             OPimNotifyManager::Alarms::Iterator it = alarms.begin();
             for ( ; it != alarms.end(); ++it ) {
                 /* only if time is valid */
                 if ( (*it).dateTime().isValid() ) {
                     als << OPimDateConversion::dateTimeToString( (*it).dateTime() )
                         + ":" + QString::number( (*it).duration() )
                         + ":" + QString::number( (*it).sound() )
                         + ":";
                 }
             }
             // now write the list
-            qWarning("als: %s", als.join("____________").latin1() );
+            owarn << "als: " << als.join("____________") << "" << oendl;
             str += "Alarms=\""+als.join(";") +"\" ";
         }
 
         /*
          * now the same for reminders but more easy. We just save the uid of the OPimEvent.
          */
         OPimNotifyManager::Reminders reminders = manager.reminders();
         if (!reminders.isEmpty() ) {
             OPimNotifyManager::Reminders::Iterator it = reminders.begin();
             QStringList records;
             for ( ; it != reminders.end(); ++it ) {
                 records << QString::number( (*it).recordUid() );
@@ -829,25 +834,25 @@ QArray<int> OPimTodoAccessXML::sorted( bool asc,  int sortOrder,
 
         /* show category */
         /* -1 == unfiled */
         if ( bCat && cat == -1 ) {
             if(!(*it).categories().isEmpty() )
                 continue;
         }else if ( bCat && cat != 0)
             if (!(*it).categories().contains( cat ) ) {
                 continue;
             }
         /* isOverdue but we should not show overdue - why?*/
 /*        if ( (*it).isOverdue() &&  !bOnly  ) {
-            qWarning("item is overdue but !bOnly");
+            owarn << "item is overdue but !bOnly" << oendl;
             continue;
         }
 */
         if ( !(*it).isOverdue() && bOnly ) {
             continue;
         }
 
         if ((*it).isCompleted() && comp ) {
             continue;
         }
 
 
@@ -882,28 +887,28 @@ QBitArray OPimTodoAccessXML::sup() {
     QBitArray ar( OPimTodo::CompletedDate +1 );
     ar.fill( true );
     ar[OPimTodo::CrossReference] = false;
     ar[OPimTodo::State ] = false;
     ar[OPimTodo::Reminders] = false;
     ar[OPimTodo::Notifiers] = false;
     ar[OPimTodo::Maintainer] = false;
 
     return ar;
 }
 QArray<int> OPimTodoAccessXML::matchRegexp(  const QRegExp &r ) const
 {
-        QArray<int> m_currentQuery( m_events.count() );
-        uint arraycounter = 0;
+    QArray<int> m_currentQuery( m_events.count() );
+    uint arraycounter = 0;
 
         QMap<int, OPimTodo>::ConstIterator it;
         for (it = m_events.begin(); it != m_events.end(); ++it ) {
-                if ( it.data().match( r ) )
-                        m_currentQuery[arraycounter++] = it.data().uid();
+        if ( it.data().match( r ) )
+            m_currentQuery[arraycounter++] = it.data().uid();
 
-        }
-        // Shrink to fit..
-        m_currentQuery.resize(arraycounter);
+    }
+    // Shrink to fit..
+    m_currentQuery.resize(arraycounter);
 
-        return m_currentQuery;
+    return m_currentQuery;
 }
 
 }