2 files changed, 157 insertions, 157 deletions

diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index 3680ded..9f3a823 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -1,230 +1,230 @@
 /*
                              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.
 */
 /*
  * =====================================================================
  * ToDo: Use plugins
  * =====================================================================
  */
 #ifndef OPIE_BACKENDFACTORY_H_
 #define OPIE_BACKENDFACTORY_H_
 
 /* OPIE */
 #include <opie2/opimaccessbackend.h>
 #include <opie2/opimglobal.h>
 #include <opie2/otodoaccessxml.h>
 #include <opie2/otodoaccessvcal.h>
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/ocontactaccessbackend_vcard.h>
 #include <opie2/odatebookaccessbackend_xml.h>
 #include <opie2/odebug.h>
 
 #ifdef __USE_SQL
 #include <opie2/otodoaccesssql.h>
 #include <opie2/ocontactaccessbackend_sql.h>
 #include <opie2/odatebookaccessbackend_sql.h>
 #endif
 
 #include <qpe/config.h>
 
 /* QT */
 #include <qstring.h>
 #include <qasciidict.h>
 
 
 
 using namespace Opie;
 using namespace Opie::Pim;
 
 namespace Opie {
-
+        
 class OBackendPrivate;
-
+        
 /**
  * This class is our factory. It will give us the default implementations
  * of at least Todolist, Contacts and Datebook. In the future this class will
  * allow users to switch the backend with ( XML->SQLite ) without the need
  * to recompile.#
  * This class - as the whole PIM Api - is making use of templates
  *
  * <pre>
  *   OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default( OPimGlobal::TODOLIST, QString::null );
  *   backend->load();
  * </pre>
  *
  * @author Stefan Eilers
  * @version 0.1
  */
-template<class T>
-class OBackendFactory
-{
- public:
-    OBackendFactory() {};
-
-        /**
-         * Returns a selected backend implementation
-         * @param type the type of the backend
-     * @param database the type of the used database
-         * @param appName The name of your application. It will be passed on to the backend.
-     * @param filename Filename of the database file if you don't want to access the default
-     * @see OPimGlobal()
-         */
-    static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
-              const QString& appName, const QString& filename = QString::null ){
-        owarn << "Selected backend for " << type << " is: " << database << oendl;
-        // If we should use the dafult database style, we have to request it
-        OPimGlobal::DatabaseStyle use_database = database;
-        if ( use_database == OPimGlobal::DEFAULT ){
-            use_database = defaultDB( type );
-        }
-
-        switch ( type ){
-        case OPimGlobal::TODOLIST:
-
-            switch ( use_database ){
-            default: // Use SQL if something weird is given.
-                // Fall through !!
-            case OPimGlobal::SQL:
+ template<class T>
+         class OBackendFactory
+         {
+         public:
+                 OBackendFactory() {};
+                 
+                 /**
+                  * Returns a selected backend implementation
+                  * @param type the type of the backend
+                  * @param database the type of the used database
+                  * @param appName The name of your application. It will be passed on to the backend.
+                  * @param filename Filename of the database file if you don't want to access the default
+                  * @see OPimGlobal()
+                  */
+                 static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
+                                   const QString& appName, const QString& filename = QString::null ){
+                         owarn << "Selected backend for " << type << " is: " << database << oendl;
+                         // If we should use the dafult database style, we have to request it
+                         OPimGlobal::DatabaseStyle use_database = database;
+                         if ( use_database == OPimGlobal::DEFAULT ){
+                                 use_database = defaultDB( type );
+                         }
+                         
+                         switch ( type ){
+                         case OPimGlobal::TODOLIST:
+                                 
+                                 switch ( use_database ){
+                                 default: // Use SQL if something weird is given.
+                                         // Fall through !!
+                                 case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                return (T*) new OPimTodoAccessBackendSQL( filename );
-                break;
+                                         return (T*) new OPimTodoAccessBackendSQL( filename );
+                                         break;
 #else
-                owarn << "OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!" << oendl;
-                // Fall through !!
+                                         owarn << "OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!" << oendl;
+                                         // Fall through !!
 #endif
-            case OPimGlobal::XML:
-                return (T*) new OPimTodoAccessXML( appName, filename );
-                break;
-            case OPimGlobal::VCARD:
-                return (T*) new OPimTodoAccessVCal( filename );
-                break;
-            }
-        case OPimGlobal::CONTACTLIST:
-            switch ( use_database ){
-            default: // Use SQL if something weird is given.
-                // Fall through !!
-            case OPimGlobal::SQL:
+                                 case OPimGlobal::XML:
+                                         return (T*) new OPimTodoAccessXML( appName, filename );
+                                         break;
+                                 case OPimGlobal::VCARD:
+                                         return (T*) new OPimTodoAccessVCal( filename );
+                                         break;
+                                 }
+                         case OPimGlobal::CONTACTLIST:
+                                 switch ( use_database ){
+                                 default: // Use SQL if something weird is given.
+                                         // Fall through !!
+                                 case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                return (T*) new OPimContactAccessBackend_SQL( appName, filename );
-                break;
+                                         return (T*) new OPimContactAccessBackend_SQL( appName, filename );
+                                         break;
 #else
-                owarn << "OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!" << oendl;
-                // Fall through !!
+                                         owarn << "OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!" << oendl;
+                                         // Fall through !!
 #endif
-            case OPimGlobal::XML:
-                return (T*) new OPimContactAccessBackend_XML( appName, filename );
-                break;
-            case OPimGlobal::VCARD:
-                return (T*) new OPimContactAccessBackend_VCard( appName, filename );
-                break;
-            }
-        case OPimGlobal::DATEBOOK:
-            switch ( use_database ){
-            default: // Use SQL if something weird is given.
-                // Fall through !!
-            case OPimGlobal::SQL:
+                                 case OPimGlobal::XML:
+                                         return (T*) new OPimContactAccessBackend_XML( appName, filename );
+                                         break;
+                                 case OPimGlobal::VCARD:
+                                         return (T*) new OPimContactAccessBackend_VCard( appName, filename );
+                                         break;
+                                 }
+                         case OPimGlobal::DATEBOOK:
+                                 switch ( use_database ){
+                                 default: // Use SQL if something weird is given.
+                                         // Fall through !!
+                                 case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                return (T*) new ODateBookAccessBackend_SQL( appName, filename );
-                break;
+                                         return (T*) new ODateBookAccessBackend_SQL( appName, filename );
+                                         break;
 #else
-                owarn << "OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!" << oendl;
-                // Fall through !!
+                                         owarn << "OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!" << oendl;
+                                         // Fall through !!
 #endif
-            case OPimGlobal::XML:
-                return (T*) new ODateBookAccessBackend_XML( appName, filename );
-                break;
-            case OPimGlobal::VCARD:
-                owarn << "OBackendFactory:: VCal Backend for DATEBOOK not implemented!" << oendl;
-                return (T*) NULL;
-                break;
-            }
-        default:
-            return (T*) NULL;
-        }
-
-    }
-
-    /**
-     * Returns the style of the default database which is used to contact PIM data.
-         * @param type the type of the backend
-     * @see OPimGlobal()
-     */
-    static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){
-        QString group_name;
-        switch ( type ){
-        case OPimGlobal::TODOLIST:
-            group_name = "todo";
-            break;
-        case OPimGlobal::CONTACTLIST:
-            group_name = "contact";
-            break;
-        case OPimGlobal::DATEBOOK:
-            group_name = "datebook";
-            break;
-        default:
-            group_name = "unknown";
-        }
-
-        Config config( "pimaccess" );
-        config.setGroup ( group_name );
-        QString db_String = config.readEntry( "usebackend", "xml" );
-
-        QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle );
-        dictDbTypes.setAutoDelete( TRUE );
-
-        dictDbTypes.insert( "xml", new int (OPimGlobal::XML) );
-        dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) );
-        dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) );
-
-            int* db_find = dictDbTypes[ db_String ];
-
-        if ( !db_find )
-            return OPimGlobal::UNKNOWN;
-
-        return (OPimGlobal::DatabaseStyle) *db_find;
-    }
-
-
-        /**
-         * Returns the default backend implementation for backendName. Which one is used, is defined
-     * by the configfile "pimaccess.conf".
-         * @param type The type of the backend (@see OPimGlobal())
-         * @param appName The name of your application. It will be passed on to the backend
-     * @see OPimGlobal()
-         */
-    static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){
-        return create( type, OPimGlobal::DEFAULT, appName );
-    }
-    private:
-    OBackendPrivate* d;
-
-};
-
+                                 case OPimGlobal::XML:
+                                         return (T*) new ODateBookAccessBackend_XML( appName, filename );
+                                         break;
+                                 case OPimGlobal::VCARD:
+                                         owarn << "OBackendFactory:: VCal Backend for DATEBOOK not implemented!" << oendl;
+                                         return (T*) NULL;
+                                         break;
+                                 }
+                         default:
+                                 return (T*) NULL;
+                         }
+                         
+                 }
+                 
+                 /**
+                  * Returns the style of the default database which is used to contact PIM data.
+                  * @param type the type of the backend
+                  * @see OPimGlobal()
+                  */
+                 static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){
+                         QString group_name;
+                         switch ( type ){
+                         case OPimGlobal::TODOLIST:
+                                 group_name = "todo";
+                                 break;
+                         case OPimGlobal::CONTACTLIST:
+                                 group_name = "contact";
+                                 break;
+                         case OPimGlobal::DATEBOOK:
+                                 group_name = "datebook";
+                                 break;
+                         default:
+                                 group_name = "unknown";
+                         }
+                         
+                         Config config( "pimaccess" );
+                         config.setGroup ( group_name );
+                         QString db_String = config.readEntry( "usebackend", "xml" );
+                         
+                         QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle );
+                         dictDbTypes.setAutoDelete( TRUE );
+                         
+                         dictDbTypes.insert( "xml", new int (OPimGlobal::XML) );
+                         dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) );
+                         dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) );
+                         
+                         int* db_find = dictDbTypes[ db_String ];
+                         
+                         if ( !db_find )
+                                 return OPimGlobal::UNKNOWN;
+                         
+                         return (OPimGlobal::DatabaseStyle) *db_find;
+                 }
+                 
+                 
+                 /**
+                  * Returns the default backend implementation for backendName. Which one is used, is defined
+                  * by the configfile "pimaccess.conf".
+                  * @param type The type of the backend (@see OPimGlobal())
+                  * @param appName The name of your application. It will be passed on to the backend
+                  * @see OPimGlobal()
+                  */
+                 static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){
+                         return create( type, OPimGlobal::DEFAULT, appName );
+                 }
+         private:
+                 OBackendPrivate* d;
+                 
+         };
+ 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index 7a3d7cb..2602493 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -1,164 +1,164 @@
 /*
                              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>
             .=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.
 */
 /*
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  */
 
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 
 /* OPIE */
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/opimresolver.h>
 #include <opie2/opimglobal.h>
 #include <opie2/odebug.h>
 
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 /* QT */
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 
 namespace Opie {
 
 OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
-             OPimContactAccessBackend* end, bool autosync ):
-    OPimAccessTemplate<OPimContact>( end )
+                                       OPimContactAccessBackend* end, bool autosync ):
+        OPimAccessTemplate<OPimContact>( end )
 {
         /* take care of the backend. If there is no one defined, we
-     * will use the XML-Backend as default (until we have a cute SQL-Backend..).
-     */
+         * will use the XML-Backend as default (until we have a cute SQL-Backend..).
+         */
         if( end == 0 ) {
-        owarn << "Using BackendFactory !" << oendl;
-        end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
+                owarn << "Using BackendFactory !" << oendl;
+                end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
         }
-    // Set backend locally and in template
+        // Set backend locally and in template
         m_backEnd = end;
-    OPimAccessTemplate<OPimContact>::setBackEnd (end);
-
-
-    /* Connect signal of external db change to function */
-    QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-    connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
-               this, SLOT(copMessage(const QCString&,const QByteArray&)) );
-    if ( autosync ){
-        QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-        connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
-             this, SLOT(copMessage(const QCString&,const QByteArray&)) );
-    }
+        OPimAccessTemplate<OPimContact>::setBackEnd (end);
+
+
+        /* Connect signal of external db change to function */
+        QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
+        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(copMessage(const QCString&,const QByteArray&)) );
+        if ( autosync ){
+                QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
+                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
+        }
 
 
 }
 OPimContactAccess::~OPimContactAccess ()
 {
     /* The user may forget to save the changed database, therefore try to
      * do it for him..
      */
     save();
     // delete m_backEnd; is done by template..
 }
 
 
 bool OPimContactAccess::save ()
 {
     /* If the database was changed externally, we could not save the
      * Data. This will remove added items which is unacceptable !
      * Therefore: Reload database and merge the data...
      */
     if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
         reload();
 
     bool status = OPimAccessTemplate<OPimContact>::save();
     if ( !status ) return false;
 
     /* Now tell everyone that new data is available.
      */
     QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
 
     return true;
 }
 
 const uint OPimContactAccess::querySettings()
 {
     return ( m_backEnd->querySettings() );
 }
 
 bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
     return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
     QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
     return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
 
 
 bool OPimContactAccess::wasChangedExternally()const
 {
     return ( m_backEnd->wasChangedExternally() );
 }
 
 
 void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
     if ( msg == "addressbookUpdated()" ){
         owarn << "OPimContactAccess: Received addressbokUpdated()" << oendl;
         emit signalChanged ( this );
     } else if ( msg == "flush()" ) {
         owarn << "OPimContactAccess: Received flush()" << oendl;
         save ();
     } else if ( msg == "reload()" ) {
         owarn << "OPimContactAccess: Received reload()" << oendl;
         reload ();
         emit signalChanged ( this );
     }
 }
 
 int OPimContactAccess::rtti() const
 {
     return OPimResolver::AddressBook;
 }
 
 }