1 files changed, 39 insertions, 6 deletions

diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 4a5cb33..2d50ecd 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -1,35 +1,65 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+              =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    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.
+*/
 #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 "oconversion.h"
-#include "opimstate.h"
-#include "otimezone.h"
-#include "opimnotifymanager.h"
-#include "orecur.h"
-#include "otodoaccessxml.h"
+#include <opie2/oconversion.h>
+#include <opie2/opimstate.h>
+#include <opie2/otimezone.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/orecur.h>
+#include <opie2/otodoaccessxml.h>
+
+using namespace Opie;
 
 namespace {
     time_t rp_end;
     ORecur* rec;
     ORecur *recur() {
         if (!rec ) rec = new ORecur;
         return rec;
     }
     int snd;
     enum MoreAttributes {
         FRType = OTodo::CompletedDate + 2,
         FRWeekdays,
@@ -57,24 +87,25 @@ char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen)
                 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 {
 
 OTodoAccessXML::OTodoAccessXML( const QString& appName,
                                 const QString& fileName )
     : OTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
 {
     if (!fileName.isEmpty() )
         m_file = fileName;
     else
         m_file = Global::applicationFileName( "todolist", "todolist.xml" );
 }
 OTodoAccessXML::~OTodoAccessXML() {
 
@@ -865,12 +896,14 @@ QArray<int> OTodoAccessXML::matchRegexp(  const QRegExp &r ) const
 
         QMap<int, OTodo>::ConstIterator it;
         for (it = m_events.begin(); it != m_events.end(); ++it ) {
                 if ( it.data().match( r ) )
                         m_currentQuery[arraycounter++] = it.data().uid();
 
         }
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 }
+
+}